aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Feist <shabble@metavore.org>2011-05-25 05:02:35 +0000
committerTom Feist <shabble@metavore.org>2011-05-25 05:02:35 +0000
commit3da7a0639922a9b5c9412ac964e1ce4e0aa7e532 (patch)
treebce42d620ea618982555237558eb3cdc2db72461
parentrl_history_search: bugfix in uberprompt autoloading code - signal_remove (diff)
downloadirssi-scripts-3da7a0639922a9b5c9412ac964e1ce4e0aa7e532.tar.gz
irssi-scripts-3da7a0639922a9b5c9412ac964e1ce4e0aa7e532.zip
rl_history_search: added use warnings, and made load_uberprompt_failed() receive
the correct arguments regardless of caller and print the failing script.
Diffstat (limited to '')
-rw-r--r--history-search/rl_history_search.pl14
1 files changed, 9 insertions, 5 deletions
diff --git a/history-search/rl_history_search.pl b/history-search/rl_history_search.pl
index 6773bd4..016249d 100644
--- a/history-search/rl_history_search.pl
+++ b/history-search/rl_history_search.pl
@@ -147,11 +147,13 @@ Yeah, probably.
use strict;
+use warnings;
+
use Irssi;
use Irssi::TextUI;
use Data::Dumper;
-our $VERSION = '2.6';
+our $VERSION = '2.7';
our %IRSSI =
(
authors => 'Tom Feist, Wouter Coekaerts',
@@ -161,7 +163,7 @@ our %IRSSI =
. ' (like ctrl-R in readline applications)',
license => 'GPLv2 or later',
url => 'http://github.com/shabble/irssi-scripts/tree/master/history-search/',
- changed => '14/4/2011',
+ changed => '25/5/2011',
requires => [qw/uberprompt.pl/],
);
@@ -190,7 +192,7 @@ sub DEBUG () { $DEBUG_ENABLED }
# check we have uberprompt loaded.
sub script_is_loaded {
- return exists($Irssi::Script::{$_[0] . '::'}) ;
+ return exists($Irssi::Script::{$_[0] . '::'});
}
if (not script_is_loaded('uberprompt')) {
@@ -202,7 +204,7 @@ if (not script_is_loaded('uberprompt')) {
Irssi::command("script load uberprompt.pl");
unless(script_is_loaded('uberprompt')) {
- load_uberprompt_failed("File does not exist");
+ load_uberprompt_failed({name => 'uberprompt'}, "File does not exist");
}
history_init();
} else {
@@ -210,13 +212,15 @@ if (not script_is_loaded('uberprompt')) {
}
sub load_uberprompt_failed {
+ my ($script, $error_msg) = @_;
Irssi::signal_remove('script error', 'load_uberprompt_failed');
+ my $script_name = $script->{name};
print "Script could not be loaded. Script cannot continue. "
. "Check you have uberprompt.pl installed in your path and "
. "try again.";
- die "Script Load Failed: " . join(" ", @_);
+ die "Script '$script_name' Load Failed: $error_msg";
}
sub history_init {