Changeset 27873

Show
Ignore:
Timestamp:
16.07.2013 02:04:30 (6 years ago)
Author:
davidb
Message:

Further adjustment after testing the Caveat-emptor release

Location:
main/trunk/greenstone3
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/gs3-server.bat

    r27864 r27873  
    2929  echo Setting Greenstone3 web home writable area to be: %gsdl3_writablehome% 
    3030 
    31   :: Calling ant target to initialize the gsdl3-writablehome area 
    32   :: ... including the all important global.properties. 
    33   ant.bat %opt_properties% configure-web 
    34  
    3531  goto runJava 
    3632 
    3733:isWritable 
    3834  del "%GSDL3HOME%\testing.tmp" 
    39   set opt_properties= 
     35  set opt_properties=-Dgsdl3.writablehome=%GSDL3HOME% 
    4036  echo  ... yes. 
    4137 
    4238:runJava 
     39 
     40:: Before running the Java program,  
     41:: call ant target to initialize the gsdl3-writablehome area (if it doesn't already exist) 
     42:: ... including the all important global.properties. 
     43 
     44ant.bat %opt_properties% configure-web 
     45 
    4346 
    4447set GSDL3PATH= 
  • main/trunk/greenstone3/gs3-server.sh

    r27863 r27873  
    9292if [ $gsdl3home_isreadonly = 1 ] ; then 
    9393    opt_properties="-Dgsdl3home.isreadonly=true -Dgsdl3.writablehome=$gsdl3_writablehome" 
     94else 
     95    opt_properties="-Dgsdl3.writablehome=$GSDL3HOME" 
     96fi 
    9497 
    95     # Calling ant target to initialize the gsdl3-writablehome area 
    96     # ... including the all important global.properties. 
     98# Calling ant target to initialize the gsdl3-writablehome area (if it doesn't already exist) 
     99# ... including the all important global.properties. 
    97100 
    98     ant $opt_properties configure-web 
     101ant $opt_properties configure-web 
    99102 
    100 fi 
    101103 
    102104# JRE_HOME or JAVA_HOME must be set correctly to run this program