Changeset 27873 for main/trunk

Timestamp:

2013-07-16T02:04:30+12:00 (11 years ago)

Author:

davidb

Message:

Further adjustment after testing the Caveat-emptor release

Location:

main/trunk/greenstone3

Files:

• gs3-server.bat (modified) (1 diff)
• gs3-server.sh (modified) (1 diff)

main/trunk/greenstone3/gs3-server.bat

@@ -29 +29 @@
   echo Setting Greenstone3 web home writable area to be: %gsdl3_writablehome%
 
-  :: Calling ant target to initialize the gsdl3-writablehome area
-  :: ... including the all important global.properties.
-  ant.bat %opt_properties% configure-web
-
   goto runJava
 
 :isWritable
   del "%GSDL3HOME%\testing.tmp"
-  set opt_properties=
+  set opt_properties=-Dgsdl3.writablehome=%GSDL3HOME%
   echo  ... yes.
 
 :runJava
+
+:: Before running the Java program, 
+:: call ant target to initialize the gsdl3-writablehome area (if it doesn't already exist)
+:: ... including the all important global.properties.
+
+ant.bat %opt_properties% configure-web
+
 
 set GSDL3PATH=

main/trunk/greenstone3/gs3-server.sh

@@ -92 +92 @@
 if [ $gsdl3home_isreadonly = 1 ] ; then
     opt_properties="-Dgsdl3home.isreadonly=true -Dgsdl3.writablehome=$gsdl3_writablehome"
+else
+    opt_properties="-Dgsdl3.writablehome=$GSDL3HOME"
+fi
 
-    # Calling ant target to initialize the gsdl3-writablehome area
-    # ... including the all important global.properties.
+# Calling ant target to initialize the gsdl3-writablehome area (if it doesn't already exist)
+# ... including the all important global.properties.
 
-    ant $opt_properties configure-web
+ant $opt_properties configure-web
 
-fi
 
 # JRE_HOME or JAVA_HOME must be set correctly to run this program