From 9175ee0bc1697ef5373ee6cbe6cc3723354cf338 Mon Sep 17 00:00:00 2001 From: altffour Date: Thu, 7 Jan 2021 12:35:06 +0300 Subject: [PATCH] attempt to fix scriptassist.pl --- scripts/scriptassist.pl | 8 +++++++- src/perl/common/Core.xs | 7 +++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/scripts/scriptassist.pl b/scripts/scriptassist.pl index 536ef33a..1ba620e3 100644 --- a/scripts/scriptassist.pl +++ b/scripts/scriptassist.pl @@ -204,7 +204,13 @@ sub get_names { $xname =~ s/\W/_/g; my $pname = "${xname}::"; if ($xname ne $sname || $sname =~ /_/) { - my $dir = Irssi::get_irssi_dir()."/scripts/"; + my $dir = ""; + if (Irssi::is_xdg_supported()) { + $dir = Irssi::get_runtime_dir()."/scripts/"; + } + else { + $dir = Irssi::get_irssi_dir()."/scripts/"; + } if ($db && exists $db->{"$sname.pl"}) { # $found = 1; } elsif (-e $dir.$plname || -e $dir."$sname.pl" || -e $dir."autorun/$sname.pl") { diff --git a/src/perl/common/Core.xs b/src/perl/common/Core.xs index 38755616..0500cd83 100644 --- a/src/perl/common/Core.xs +++ b/src/perl/common/Core.xs @@ -606,6 +606,13 @@ CODE: OUTPUT: RETVAL +char * +get_runtime_dir() +CODE: + RETVAL = (char *) g_build_filename(g_get_user_runtime_dir(), "irssi", NULL); +OUTPUT: + RETVAL + char * get_irssi_dir() CODE: