Changeset 24832 for main/trunk/greenstone2/perllib

Timestamp:

2011-11-30T20:01:30+13:00 (12 years ago)

Author:

ak19

Message:

1. util.pm's envvar_prepend and append subroutines now escape backslashes for internal regex operations not only for windows but throughout, and the filename_to_regex subroutine also escapes backslashes for all OS now. 2. makegs2.bat prints a warning at the very end to tell the user that the command prompt has been left in shortfilename mode.

File:

• main/trunk/greenstone2/perllib/util.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/util.pm

@@ -838 +838 @@
 
     # need to put single backslash back to double so that regex works
-    if ($ENV{'GSDLOS'} =~ /^windows$/i) {
-        $filename =~ s/\\/\\\\/g;
-    }
+    $filename =~ s/\\/\\\\/g; # if ($ENV{'GSDLOS'} =~ /^windows$/i);    
     
-    # note that the first part of a substitution is a regex, so RE chars need to be escaped,
-    # the second part of a substitution is not a regex, so for e.g. full-stop can be specified literally
+    # note that the first part of a substitution is a regex, so RE chars need to be escaped,
+    # the second part of a substitution is not a regex, so for e.g. full-stop can be specified literally
     $filename =~ s/\./\\./g; # in case there are extensions/other full stops, escape them
     $filename =~ s@\(@\\(@g; # escape brackets
@@ -944 +942 @@
 
     # do not prepend any value/path that's already in the environment variable
-    if ($ENV{'GSDLOS'} =~ /^windows$/i) 
-    {
-    my $escaped_val = &filename_to_regex($val); # escape any Windows backslashes and brackets for upcoming regex
-    if (!defined($ENV{$var})) {
-        $ENV{$var} = "$val";
-    }
-    elsif($ENV{$var} !~ m/$escaped_val/) { 
-        $ENV{$var} = "$val;".$ENV{$var};
-    }
-    }
-    else {
-    if (!defined($ENV{$var})) {
-        $ENV{$var} = "$val";
-    }
-    elsif($ENV{$var} !~ m/$val/) { 
-        $ENV{$var} = "$val:".$ENV{$var};
-    }
+    
+    my $escaped_val = &filename_to_regex($val); # escape any backslashes and brackets for upcoming regex
+    if (!defined($ENV{$var})) {
+    $ENV{$var} = "$val";
+    }
+    elsif($ENV{$var} !~ m/$escaped_val/) { 
+    $ENV{$var} = "$val;".$ENV{$var};
     }
 }
@@ -966 +954 @@
 sub envvar_append {
     my ($var,$val) = @_;
-
+    
     # do not append any value/path that's already in the environment variable
-    if ($ENV{'GSDLOS'} =~ /^windows$/i) 
-    {
-    my $escaped_val = &filename_to_regex($val); # escape any Windows backslashes and brackets for upcoming regex
-    if (!defined($ENV{$var})) {
-        $ENV{$var} = "$val";
-    }
-    elsif($ENV{$var} !~ m/$escaped_val/) { 
-        $ENV{$var} .= ";$val";
-    }
-    }
-    else {
-    if (!defined($ENV{$var})) {
-        $ENV{$var} = "$val";
-    }
-    elsif($ENV{$var} !~ m/$val/) { 
-        $ENV{$var} .= ":$val";
-    }
-    }    
+    
+    my $escaped_val = &filename_to_regex($val); # escape any backslashes and brackets for upcoming regex
+    if (!defined($ENV{$var})) {
+    $ENV{$var} = "$val";
+    }
+    elsif($ENV{$var} !~ m/$escaped_val/) { 
+    $ENV{$var} .= ";$val";
+    }
 }