Changeset 23963

Timestamp:

2011-04-28T15:57:27+12:00 (13 years ago)

Author:

ak19

Message:

GSDLHOME placeholder is set to path to gsdlhome in .app files for Mac. Still need to test on windows

Location:

main/trunk/greenstone2

Files:

• client-gli.app/Contents/document.wflow.in (added)
• gems.app/Contents/document.wflow.in (added)
• gli.app/Contents/document.wflow.in (added)
• gs2-server.app/Contents/document.wflow.in (added)
• gsicontrol.bat (modified) (2 diffs)
• gsicontrol.sh (modified) (1 diff)

main/trunk/greenstone2/gsicontrol.bat

@@ -175 +175 @@
     del "%GSDLHOME%\%cgibin%\gsdlsite.cfg"
 )
+
+set _sed="bin\windows\sed.exe"
+for /F "delims=*" %%T in ('"echo %GSDLHOME%| bin\windows\sed.exe s@\\@\/@g"') do set safepath=%%T
+
+type "gs2-server.app/Contents/document.wflow.in" | %_sed% "s@\*\*GSDLHOME\*\*@%safepath%@g" > "gs2-server.app/Contents/document.wflow" 
+type "gli.app/Contents/document.wflow.in" | %_sed% "s@\*\*GSDLHOME\*\*@%safepath%@g" > "gli.app/Contents/document.wflow" 
+type "client-gli.app/Contents/document.wflow.in" | %_sed% "s@\*\*GSDLHOME\*\*@%safepath%@g" > "client-gli.app/Contents/document.wflow" 
+type "gems.app/Contents/document.wflow.in" | %_sed% "s@\*\*GSDLHOME\*\*@%safepath%@g" > "gems.app/Contents/document.wflow" 
+
 goto cfgweb
+
 
 ::configure-web
@@ -248 +258 @@
    goto exit
 )
-set _sed="bin\windows\sed.exe"
-for /F "delims=*" %%T in ('"echo %GSDLHOME%| bin\windows\sed.exe s@\\@\/@g"') do set safepath=%%T
+if "%_sed%" == "" set _sed="bin\windows\sed.exe"
+if "%safepath%" == "" for /F "delims=*" %%T in ('"echo %GSDLHOME%| bin\windows\sed.exe s@\\@\/@g"') do set safepath=%%T
 
 if exist "%GSDLHOME%\%cgibin%\gsdlsite.cfg" FOR /F "tokens=2" %%G IN ('findstr /R ^collecthome "%GSDLHOME%\%cgibin%\gsdlsite.cfg"') do set COLLECTHOME=%%G

main/trunk/greenstone2/gsicontrol.sh

@@ -151 +151 @@
     rm -f "$GSDLHOME/$cgibin/gsdlsite.cfg";
     fi
+
+    sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" "gs2-server.app/Contents/document.wflow.in" > "gs2-server.app/Contents/document.wflow"
+    sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" "gli.app/Contents/document.wflow.in" > "gli.app/Contents/document.wflow"
+    sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" "client-gli.app/Contents/document.wflow.in" > "client-gli.app/Contents/document.wflow"
+    sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" "gems.app/Contents/document.wflow.in" > "gems.app/Contents/document.wflow"
+
     configure-web $1
 }