Changeset 27521 for main

Timestamp:

2013-05-30T20:53:34+12:00 (11 years ago)

Author:

ak19

Message:

Resetting gsdlhome (reset-gsdlhome command) should not just update the perl shebang for gliserver.pl but also checksum.pl and metadata-server.pl

Location:

main/trunk/greenstone2

Files:

• gsicontrol.bat (modified) (2 diffs)
• gsicontrol.sh (modified) (2 diffs)

main/trunk/greenstone2/gsicontrol.bat

@@ -207 +207 @@
 
 :relocate
-:: The path to the included perl at the top of gliserver.pl needs to use the new gsdlhome
-:: On windows, the path in gliserver.pl uses backslashes
+:: The path to the included perl at the top of gliserver.pl and other cgi-bin perl files needs to use the new gsdlhome
+:: On windows, the path in gliserver.pl and the others uses backslashes
 for /F "delims=*" %%T in ('"echo !gshome!| !_sed! s@\\@\\\\@g"') do set safeoldhome=%%T
 for /F "delims=*" %%T in ('"echo !gsdlhome!| !_sed! s@\\@\\\\@g"') do set safenewhome=%%T
@@ -215 +215 @@
   type "!cgibin!\gliserver.pl.bak" | !_sed! "s@!safeoldhome!@!safenewhome!@g" > "!cgibin!\gliserver.pl"
   del "!cgibin!\gliserver.pl.bak"
+
+  copy "!cgibin!\metadata-server.pl" "!cgibin!\metadata-server.pl.bak"
+  type "!cgibin!\metadata-server.pl.bak" | !_sed! "s@!safeoldhome!@!safenewhome!@g" > "!cgibin!\metadata-server.pl"
+  del "!cgibin!\metadata-server.pl.bak"
+
+  copy "!cgibin!\checksum.pl" "!cgibin!\checksum.pl.bak"
+  type "!cgibin!\checksum.pl.bak" | !_sed! "s@!safeoldhome!@!safenewhome!@g" > "!cgibin!\checksum.pl"
+  del "!cgibin!\checksum.pl.bak"
 )
 set safenewhome=

main/trunk/greenstone2/gsicontrol.sh

@@ -179 +179 @@
     relocate=yes ;
 
-# don't just update gsdlsite.cfg, but also the path to perl at the top of gliserver.pl
+# don't just update gsdlsite.cfg, but also the path to perl at the top of gliserver.pl and the other cgi-bin perl files
 # if this is a perl included with the Greenstone distribution
     if test -e "$GSDLHOME/$cgibin/gsdlsite.cfg" ; then
@@ -193 +193 @@
         sed "s@$stored_gsdlhome@$GSDLHOME@g" "$gliserverfile.bak" > "$gliserverfile" ;
         rm -f "$gliserverfile.bak" ;
+
+        metaserverfile=$GSDLHOME/$cgibin/metadata-server.pl ;
+        /bin/cp "$metaserverfile" "$metaserverfile.bak" ;       
+        sed "s@$stored_gsdlhome@$GSDLHOME@g" "$metaserverfile.bak" > "$metaserverfile" ;
+        rm -f "$metaserverfile.bak" ;
+
+        checksumfile=$GSDLHOME/$cgibin/checksum.pl ;
+        /bin/cp "$checksumfile" "$checksumfile.bak" ;       
+        sed "s@$stored_gsdlhome@$GSDLHOME@g" "$checksumfile.bak" > "$checksumfile" ;
+        rm -f "$checksumfile.bak" ;
         fi