Changeset 23314

Timestamp:

2010-11-10T16:45:13+13:00 (13 years ago)

Author:

sjm84

Message:

Katherine discovered that the newly added sub setup_greenstone_env needs to clear the GSDLHOME env variable before calling setup.bash (otherwise calling setup.bash/bat terminates assuming that the GS environment was already set up.

File:

• main/trunk/greenstone2/perllib/util.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/util.pm

@@ -1388 +1388 @@
     #my %env_map = ();
     # Get the localised ENV settings of running a localised source setup.bash 
-    # and put it into the ENV here.
-    my $perl_command = "(cd $GSDLHOME; . ./setup.bash > /dev/null; env)";
+    # and put it into the ENV here. Need to clear GSDLHOME before running setup
+    #my $perl_command = "(cd $GSDLHOME; export GSDLHOME=; . ./setup.bash > /dev/null; env)";
+    my $perl_command = "(cd $GSDLHOME; /bin/bash -c \"export GSDLHOME=; source setup.bash > /dev/null; env\")";     
     if($GSDLOS =~ m/windows/i) {
-        #$perl_command = "(cmd && cd $GSDLHOME && setup.bat > nul && set && exit)";
-        $perl_command = "(cd $GSDLHOME && setup.bat > nul && set)";
+        #$perl_command = "cmd /C \"cd $GSDLHOME&& set GSDLHOME=&& setup.bat > nul&& set\"";
+        $perl_command = "(cd $GSDLHOME&& set GSDLHOME=&& setup.bat > nul&& set)";
     }
     if (!open(PIN, "$perl_command |")) {