Changeset 38417

Timestamp:

2023-11-21T14:55:40+13:00 (5 months ago)

Author:

anupama

Message:

Dr Bainbridge pointed out that the gs3-server script should source the new SETUP script instead of the gs3-setup script, as SETUP will source cli extensions besides sourcing the gs3-setup script. We also need gs3-server.bat to do the same, for which we need a SETUP.bat first.

Location:

main/trunk/greenstone3

Files:

• SETUP.bat (added)
• gs3-server.bat (modified) (2 diffs)
• gs3-server.sh (modified) (2 diffs)

main/trunk/greenstone3/gs3-server.bat

@@ -14 +14 @@
 
 :: Setup Greenstone, unless it has already been done
-if "%GSDL3SRCHOME%" == "" call "%GSDL3PATH%\gs3-setup.bat" SetEnv > nul
+::if "%GSDL3SRCHOME%" == "" call "%GSDL3PATH%\gs3-setup.bat" SetEnv > nul
+if "%GSDL3SRCHOME%" == "" call "%GSDL3PATH%\SETUP.bat" SetEnv > nul
 
 set USE_TMPDIR_FOR_TOMCAT=
@@ -56 +57 @@
 
 "%RUNJAVA%" -cp "%CLASSPATH%" %opt_properties% org.greenstone.server.Server3 "%GSDL3SRCHOME%"
-
-
-
-
- 

main/trunk/greenstone3/gs3-server.sh

@@ -83 +83 @@
 # Setup Greenstone3
 pushd $gsdl3path > /dev/null
-source ./gs3-setup.sh
+#source ./gs3-setup.sh
+source ./SETUP.bash
 popd > /dev/null
 
@@ -129 +130 @@
     popd > /dev/null
 fi
-