Changeset 23963

Show
Ignore:
Timestamp:
28.04.2011 15:57:27 (8 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:
4 added
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/gsicontrol.bat

    r23949 r23963  
    175175    del "%GSDLHOME%\%cgibin%\gsdlsite.cfg" 
    176176) 
     177 
     178set _sed="bin\windows\sed.exe" 
     179for /F "delims=*" %%T in ('"echo %GSDLHOME%| bin\windows\sed.exe s@\\@\/@g"') do set safepath=%%T 
     180 
     181type "gs2-server.app/Contents/document.wflow.in" | %_sed% "s@\*\*GSDLHOME\*\*@%safepath%@g" > "gs2-server.app/Contents/document.wflow"  
     182type "gli.app/Contents/document.wflow.in" | %_sed% "s@\*\*GSDLHOME\*\*@%safepath%@g" > "gli.app/Contents/document.wflow"  
     183type "client-gli.app/Contents/document.wflow.in" | %_sed% "s@\*\*GSDLHOME\*\*@%safepath%@g" > "client-gli.app/Contents/document.wflow"  
     184type "gems.app/Contents/document.wflow.in" | %_sed% "s@\*\*GSDLHOME\*\*@%safepath%@g" > "gems.app/Contents/document.wflow"  
     185 
    177186goto cfgweb 
     187 
    178188 
    179189::configure-web 
     
    248258   goto exit 
    249259) 
    250 set _sed="bin\windows\sed.exe" 
    251 for /F "delims=*" %%T in ('"echo %GSDLHOME%| bin\windows\sed.exe s@\\@\/@g"') do set safepath=%%T 
     260if "%_sed%" == "" set _sed="bin\windows\sed.exe" 
     261if "%safepath%" == "" for /F "delims=*" %%T in ('"echo %GSDLHOME%| bin\windows\sed.exe s@\\@\/@g"') do set safepath=%%T 
    252262 
    253263if 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

    r23948 r23963  
    151151    rm -f "$GSDLHOME/$cgibin/gsdlsite.cfg"; 
    152152    fi 
     153 
     154    sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" "gs2-server.app/Contents/document.wflow.in" > "gs2-server.app/Contents/document.wflow" 
     155    sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" "gli.app/Contents/document.wflow.in" > "gli.app/Contents/document.wflow" 
     156    sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" "client-gli.app/Contents/document.wflow.in" > "client-gli.app/Contents/document.wflow" 
     157    sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" "gems.app/Contents/document.wflow.in" > "gems.app/Contents/document.wflow" 
     158 
    153159    configure-web $1 
    154160}