Changeset 23256

Timestamp:

2010-11-01T10:46:00+13:00 (12 years ago)

Author:

sjm84

Message:

More minor installer/uninstaller modifications

Location:

main/trunk/release-kits/shared

Files:

• core/uninstaller/Uninstall.bat (modified) (1 diff)
• linux/wrapper.cpp (modified) (2 diffs)

main/trunk/release-kits/shared/core/uninstaller/Uninstall.bat

@@ -30 +30 @@
     if "%1" == "Elevated" shift
 
-if exist ..\bin\windows\search4j.exe ..\bin\windows\search4j.exe -p ..\packages\jre -l .\uninst.jar
+cd ..
+if exist .\bin\windows\search4j.exe .\bin\windows\search4j.exe -p .\packages\jre -l .\uninstall\uninst.jar
 
-if exist ..\gs2build\bin\windows\search4j.exe ..\gs2build\bin\windows\search4j.exe -p ..\packages\jre -l .\uninst.jar
-
+if exist .\gs2build\bin\windows\search4j.exe .\gs2build\bin\windows\search4j.exe -p .\packages\jre -l .\uninstall\uninst.jar
 
 if exist uninst.flag (
 
-    rd /s /q ..\packages\jre
-    rmdir ..\packages
+    rd /s /q packages\jre
+    rmdir packages
     
-    if exist ..\bin\windows\search4j.exe (
-        del ..\bin\windows\search4j.exe
-        rmdir ..\bin\windows
+    if exist bin\windows\search4j.exe (
+        del bin\windows\search4j.exe
+        rmdir bin\windows
     )
-    if exist ..\gs2build\bin\windows\search4j.exe (
-        del ..\gs2build\bin\windows\search4j.exe
-        rd /s /q ..\gs2build
+    if exist gs2build\bin\windows\search4j.exe (
+        del gs2build\bin\windows\search4j.exe
+        rd /s /q gs2build
     )
         
-    del uninst.jar
-    del uninst.flag
-    del Uninstall.*
-    del *.uninstall
-    rmdir /S /Q ..\bin
-    rmdir /S /Q ..\tmp
-    rmdir /S /Q ..\ext
+    del uninstall\uninst.jar
+    del uninstall\uninst.flag
+    del uninstall\Uninstall.*
+    del uninstall\*.uninstall
+    rmdir /S /Q bin
+    rmdir /S /Q tmp
+    rmdir /S /Q ext
     
-    cd ..
     set GSDEL=!CD!
-    cd ..
     
     echo @echo off > %TEMP%\gsuninstall.bat

main/trunk/release-kits/shared/linux/wrapper.cpp

@@ -19 +19 @@
         << "Usage: " << progname << " [OPTIONS]" << endl
         << "OPTIONS: " << endl
-        << " -h, -help          Display this usage message" << endl
-        << " -text (Depricated) Do a non-graphical command line installation" << endl;
+        << " -h, -help   Display this usage message" << endl
+        << " -textonly   Do a non-graphical command line installation" << endl;
+        << " -extract    Extract the jar file, this can " << endl;
     #ifdef CDROM
     cerr << " -wd PATH          Look for the CD-ROM at PATH" << endl;
@@ -49 +50 @@
         } else if ( a.compare("-h") == 0 || a.compare("-help") == 0 || a.compare("--help") == 0) {
             usage( argv[0], 0 );
-        } else if ( a.compare("-text") == 0 || a.compare("text") == 0 ) {
-            cerr << "-text is depricated, please use -extract and then run \"java -jar greenstone.jar text\"" << endl;
+        } else if ( a.compare("-textonly") == 0 || a.compare("-text") == 0 || a.compare("text") == 0 ) {
+            //cerr << "-text is deprecated, please use -extract and then run \"java -jar greenstone.jar text\"" << endl;
             text_mode = true;
 #ifndef CDROM