X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FScript.pm;h=c18de6304bacf954c378fcdbd14330984e0b9f24;hb=8b2a7cbe3ddf35abde3a4a8f8f610bd827835f1b;hp=4c8d0f3bf3f3af1a55b3dc699e22375068fe0bc1;hpb=06392dc488efff54948322d2c312f2899d12b7d9;p=spider.git

diff --git a/perl/Script.pm b/perl/Script.pm
index 4c8d0f3b..c18de630 100644
--- a/perl/Script.pm
+++ b/perl/Script.pm
@@ -3,7 +3,7 @@
 #
 # Copyright (c) 2001 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 package Script;
@@ -17,18 +17,12 @@ use DXCommandmode;
 use DXVars;
 use IO::File;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 my $base = "$main::root/scripts";
 
 sub clean
 {
 	my $s = shift;
-	$s =~ s/[^-\w\.]//g;
+	$s =~ s/([-\w\d_]+)/$1/g;
 	return $s;
 }
 
@@ -124,5 +118,26 @@ sub lines
 sub erase
 {
 	my $self = shift;
-	unlink $self->{fn};
+	my $call = clean($self->{call});
+
+	my $fn;
+	my $try;
+
+	$try = "$base/" . clean(lc $self->call);
+	if (-w $try) {
+		$fn = $try;
+	} else {
+		$try = "$base/" . clean(uc $self->call);
+		if (-w $try) {
+			$fn = $try;
+		}
+	}
+
+	if ($fn && -w $fn) {
+		unless (unlink $fn) {
+			return ($self->msg('m22'. $call)); 
+		}
+		return ($self->msg('m20', $call));
+	}
+	return ($self->msg('e3', "unset/startup", $call));
 }