- Timestamp:
- 2011-11-30T20:01:30+13:00 (12 years ago)
- Location:
- main/trunk/greenstone2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/makegs2.bat
r24820 r24832 290 290 291 291 :END 292 echo. 293 echo **** Note that this command prompt has been left in Short-Filename mode. 294 echo. 292 295 popd -
main/trunk/greenstone2/perllib/util.pm
r24829 r24832 838 838 839 839 # need to put single backslash back to double so that regex works 840 if ($ENV{'GSDLOS'} =~ /^windows$/i) { 841 $filename =~ s/\\/\\\\/g; 842 } 840 $filename =~ s/\\/\\\\/g; # if ($ENV{'GSDLOS'} =~ /^windows$/i); 843 841 844 845 842 # note that the first part of a substitution is a regex, so RE chars need to be escaped, 843 # the second part of a substitution is not a regex, so for e.g. full-stop can be specified literally 846 844 $filename =~ s/\./\\./g; # in case there are extensions/other full stops, escape them 847 845 $filename =~ s@\(@\\(@g; # escape brackets … … 944 942 945 943 # do not prepend any value/path that's already in the environment variable 946 if ($ENV{'GSDLOS'} =~ /^windows$/i) 947 { 948 my $escaped_val = &filename_to_regex($val); # escape any Windows backslashes and brackets for upcoming regex 949 if (!defined($ENV{$var})) { 950 $ENV{$var} = "$val"; 951 } 952 elsif($ENV{$var} !~ m/$escaped_val/) { 953 $ENV{$var} = "$val;".$ENV{$var}; 954 } 955 } 956 else { 957 if (!defined($ENV{$var})) { 958 $ENV{$var} = "$val"; 959 } 960 elsif($ENV{$var} !~ m/$val/) { 961 $ENV{$var} = "$val:".$ENV{$var}; 962 } 944 945 my $escaped_val = &filename_to_regex($val); # escape any backslashes and brackets for upcoming regex 946 if (!defined($ENV{$var})) { 947 $ENV{$var} = "$val"; 948 } 949 elsif($ENV{$var} !~ m/$escaped_val/) { 950 $ENV{$var} = "$val;".$ENV{$var}; 963 951 } 964 952 } … … 966 954 sub envvar_append { 967 955 my ($var,$val) = @_; 968 956 969 957 # do not append any value/path that's already in the environment variable 970 if ($ENV{'GSDLOS'} =~ /^windows$/i) 971 { 972 my $escaped_val = &filename_to_regex($val); # escape any Windows backslashes and brackets for upcoming regex 973 if (!defined($ENV{$var})) { 974 $ENV{$var} = "$val"; 975 } 976 elsif($ENV{$var} !~ m/$escaped_val/) { 977 $ENV{$var} .= ";$val"; 978 } 979 } 980 else { 981 if (!defined($ENV{$var})) { 982 $ENV{$var} = "$val"; 983 } 984 elsif($ENV{$var} !~ m/$val/) { 985 $ENV{$var} .= ":$val"; 986 } 987 } 958 959 my $escaped_val = &filename_to_regex($val); # escape any backslashes and brackets for upcoming regex 960 if (!defined($ENV{$var})) { 961 $ENV{$var} = "$val"; 962 } 963 elsif($ENV{$var} !~ m/$escaped_val/) { 964 $ENV{$var} .= ";$val"; 965 } 988 966 } 989 967
Note:
See TracChangeset
for help on using the changeset viewer.