From dd00b14d51335ff43263c93c852ab69cd7ac459a Mon Sep 17 00:00:00 2001 From: Ricardo Mones Date: Fri, 19 Aug 2016 00:54:08 +0200 Subject: [PATCH] Detect only Claws Mail 3.9.1 or greater --- clawsker | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/clawsker b/clawsker index 497b42a..1d65e24 100755 --- a/clawsker +++ b/clawsker @@ -386,16 +386,12 @@ sub claws_is_running { sub check_claws_not_running { my $tmpdir = (defined $ENV{TMPDIR})? $ENV{TMPDIR}: '/tmp'; $tmpdir = '/tmp' if ($tmpdir eq ''); - my $socket = (not $ALTCONFIGDIR)? $tmpdir: $CONFIGDIR; - $socket .= "/claws-mail-$<"; - -S $socket and return claws_is_running (); - # since 3.9.0cvs36 my $lockdir = "$tmpdir/claws-mail-$<"; -d $lockdir and do { - $_ = $CONFIGDIR; - s/\/$//; - $socket = "$lockdir/" . md5_hex ($_); - -S $socket and return claws_is_running (); + $_ = $CONFIGDIR; + s/\/$//; + my $socket = "$lockdir/" . md5_hex ($_); + -S $socket and return claws_is_running (); }; return TRUE; } -- 2.25.1