Changeset 23964 for main/trunk/greenstone2

Timestamp:

2011-04-28T16:56:34+12:00 (13 years ago)

Author:

ak19

Message:

Minor fixes to gems.app and the recent changes to gsicontrol.bat regarding replacing the GSDLHOME placeholder string

Location:

main/trunk/greenstone2

Files:

• gems.app/Contents/document.wflow.in (modified) (1 diff)
• gsicontrol.bat (modified) (2 diffs)

main/trunk/greenstone2/gems.app/Contents/document.wflow.in

@@ -56 +56 @@
                 <dict>
                     <key>COMMAND_STRING</key>
-                    <string>cd **GSDLHOME**/gli/
-./gems.sh</string>
+                    <string>**GSDLHOME**/gli/gems.sh</string>
                     <key>CheckedForUserDefaultShell</key>
                     <true/>

main/trunk/greenstone2/gsicontrol.bat

@@ -15 +15 @@
 :: Construct the signal using the unique GS2 installation
 :: directory (after replacing spaces, colons and backslashes)
+if "%GSDLHOME%" == "" goto testgsdl
 set signal=%GSDLHOME: =_%
 for /F "delims=*" %%T in ('"echo %signal%| bin\windows\sed.exe s@[\\:]@_@g"') do set signal=%%T
@@ -179 +180 @@
 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" 
+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