zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-22 01:52:19 +02:00
Code Issues Projects Releases Packages Wiki Activity

implement API changes to accomodate for XDG

Browse source 
- add is_xdg_supported() (C and Perl).
- use $XDG_CONFIG_HOME/irssi/ only when it is present.
- fallback mechanism added.
- scripts are run from $XDG_DATA_HOME/irssi/scripts/[autorun], if and
only if xdg is used.
This commit is contained in:
altffour 2021-01-06 19:07:18 +03:00
commit e6b9a07f9a
No known key found for this signature in database
GPG key ID: B4ADFA86EDF5CCE9
4 changed files with 51 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/perl/perl-core.c
View file

@ -390,43 +390,24 @@ char *perl_script_get_path(const char *name)
file = IS_PERL_SCRIPT(name) ? g_strdup(name) :
g_strdup_printf("%s.pl", name);
/* check from %XDG_DATA_HOME% */
path = g_build_filename(g_get_user_data_dir(), "irssi/scripts/", file, NULL);
if (stat(path, &statbuf) != 0) {
g_free(path);
path = g_strdup_printf(SCRIPTDIR"/%s", file);
/* check if xdg paths are being used, if so locate scripts based on that */
if (is_xdg_supported()) {
path = g_build_filename(g_get_user_data_dir(), "irssi", "scripts", file, NULL);
if (stat(path, &statbuf) != 0) {
g_free(path);
path = NULL;
} else {
g_free(file);
return path;
}
}
/* check from %XDG_CONFIG_HOME% */
path = g_build_filename(g_get_user_config_dir(), "irssi/scripts/", file, NULL);
if (stat(path, &statbuf) != 0) {
g_free(path);
path = g_strdup_printf(SCRIPTDIR"/%s", file);
} else {
/* check from ~/.irssi/scripts/ */
path = g_strdup_printf("%s/scripts/%s", get_irssi_dir(), file);
if (stat(path, &statbuf) != 0) {
/* check from SCRIPTDIR */
g_free(path);
path = NULL;
} else {
g_free(file);
return path;
}
}
/* check from ~/.irssi/scripts/ */
path = g_strdup_printf("%s/scripts/%s", get_irssi_dir(), file);
if (stat(path, &statbuf) != 0) {
/* check from SCRIPTDIR */
g_free(path);
path = g_strdup_printf(SCRIPTDIR"/%s", file);
if (stat(path, &statbuf) != 0) {
g_free(path);
path = NULL;
path = g_strdup_printf(SCRIPTDIR "/%s", file);
if (stat(path, &statbuf) != 0) {
g_free(path);
path = NULL;
}
}
}
g_free(file);
@ -452,8 +433,10 @@ void perl_scripts_autorun(void)
struct stat statbuf;
char *path, *fname;
/* run *.pl scripts from ~/.irssi/scripts/autorun/ */
path = g_strdup_printf("%s/scripts/autorun", get_irssi_dir());
if (is_xdg_supported())
path = g_build_filename(g_get_user_data_dir(), "irssi", "scripts", "autorun", NULL);
else
path = g_strdup_printf("%s/scripts/autorun", get_irssi_dir());
dirp = opendir(path);
if (dirp == NULL) {
g_free(path);