From: Ailin Nemui <redacted>
Date: Tue, 31 May 2022 18:44:38 +0000 (+0200)
Subject: fix irssi_version check crashing on some dev builds
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=9eb781e90ba664d7d24d8c9e293ddd06675c9832;p=irssi-scripts.irssi.org.git

fix irssi_version check crashing on some dev builds

same code used in:
- scriptassist
- hideshow
- cap_sasl_fail
---

diff --git a/scripts/cap_sasl_fail.pl b/scripts/cap_sasl_fail.pl
index 22d0b79..c6cf749 100644
--- a/scripts/cap_sasl_fail.pl
+++ b/scripts/cap_sasl_fail.pl
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-our $VERSION = '2.1'; # bb62357c61d9e54
+our $VERSION = '2.1.1'; # 37516176d72331c
 our %IRSSI = (
     authors     => 'Nei',
     name        => 'cap_sasl_fail',
@@ -14,7 +14,7 @@ use version;
 
 my %disconnect_next;
 
-my $irssi_version = qv(Irssi::parse_special('v$J') =~ s/-.*//r);
+my $irssi_version = qv('v'.Irssi::parse_special('$J') =~ s/[^.\d].*//r);
 die sprintf "Please use /set sasl_disconnect_on_failure instead of this script.\n"
     if $irssi_version >= v1.0.0;
 
diff --git a/scripts/hideshow.pl b/scripts/hideshow.pl
index 4c42ba5..fac376d 100644
--- a/scripts/hideshow.pl
+++ b/scripts/hideshow.pl
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-our $VERSION = '0.4.5'; # 701c53e4db98fb0
+our $VERSION = '0.4.6'; # 4cc7adcb14932da
 our %IRSSI = (
     authors     => 'Nei',
     contact     => 'Nei @ anti@conference.jabber.teamidiot.de',
@@ -50,7 +50,7 @@ use Irssi::TextUI;
 use Encode;
 use version;
 
-my $irssi_version = qv(Irssi::parse_special('v$J') =~ s/-.*//r);
+my $irssi_version = qv('v'.Irssi::parse_special('$J') =~ s/[^.\d].*//r);
 
 sub setc () {
     $IRSSI{name}
diff --git a/scripts/scriptassist.pl b/scripts/scriptassist.pl
index cf02d57..5cad383 100644
--- a/scripts/scriptassist.pl
+++ b/scripts/scriptassist.pl
@@ -5,7 +5,7 @@
 
 use strict;
 
-our $VERSION = '2020042700';
+our $VERSION = '2022053100';
 our %IRSSI = (
     authors     => 'Stefan \'tommie\' Tomanek',
     contact     => 'stefan@pico.ruhr.de',
@@ -30,7 +30,7 @@ $have_gpg = 0;
 eval "use GnuPG qw(:algo :trust);";
 $have_gpg = 1 if not ($@);
 
-my $irssi_version = qv(Irssi::parse_special('v$J') =~ s/-.*//r);
+my $irssi_version = qv('v'.Irssi::parse_special('$J') =~ s/[^.\d].*//r);
 
 sub show_help {
     my $help = "scriptassist $VERSION