Changeset 22572

Timestamp:

2010-08-05T09:39:38+12:00 (14 years ago)

Author:

sjm84

Message:

Renamed gs2-server.bat to gs2-web-server.bat and created a new script called gs2-server.bat that runs either the apache server (gs2-web-server.bat) or the local library server (server.exe) depending on whether or not server.exe exists

Location:

main/trunk/greenstone2

Files:

• gs2-server.bat (added)
• gs2-web-server.bat (copied) (copied from main/trunk/greenstone2/gs2-server.bat ) (1 diff)

main/trunk/greenstone2/gs2-web-server.bat

@@ -24 +24 @@
    set gsdl2path=%CD%
 )
+
+:checkUserPermissions
+    echo Checking if the Greenstone log directory is writable ...
+    (echo This is a temporary file. It is safe to delete it. > "%GSDLHOME%\etc\logs-gsi\testing.tmp" ) 2>nul
+    if exist "%GSDLHOME%\etc\logs-gsi\testing.tmp" goto deleteTempFile  
+    if "%1" == "Elevated" goto printWarning
+    echo ... FAILED
+    echo The Greenstone server cannot write to the log directory (%GSDLHOME%\etc\logs-gsi)
+    echo Requesting elevated status to become admin user to continue.
+    "%GSDLHOME%\bin\windows\gstart.exe" %0 Elevated %1 %2 %3 %4 %5 %6 %7 %8 %9
+    goto done
+    
+:printWarning
+    echo ... FAILED
+    echo The Greenstone server cannot write to the log directory (%GSDLHOME%\etc\logs-gsi). 
+    echo Attempting to continue without permissions.
+    goto shiftElevated
+
+:deleteTempFile
+    echo ... OK
+    del "%GSDLHOME%\etc\logs-gsi\testing.tmp"
+
+:shiftElevated
+:: Shift "Elevated" (one of our own internal command words) out of the way if present
+:: so the command-line is as it was when the user initiated the command
+    if "%1" == "Elevated" shift
+
 echo GS2 Home: %GSDLHOME%