Changeset 23256


Ignore:
Timestamp:
2010-11-01T10:46:00+13:00 (11 years ago)
Author:
sjm84
Message:

More minor installer/uninstaller modifications

Location:
main/trunk/release-kits/shared
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/shared/core/uninstaller/Uninstall.bat

    r23243 r23256  
    3030    if "%1" == "Elevated" shift
    3131
    32 if exist ..\bin\windows\search4j.exe ..\bin\windows\search4j.exe -p ..\packages\jre -l .\uninst.jar
     32cd ..
     33if exist .\bin\windows\search4j.exe .\bin\windows\search4j.exe -p .\packages\jre -l .\uninstall\uninst.jar
    3334
    34 if exist ..\gs2build\bin\windows\search4j.exe ..\gs2build\bin\windows\search4j.exe -p ..\packages\jre -l .\uninst.jar
    35 
     35if exist .\gs2build\bin\windows\search4j.exe .\gs2build\bin\windows\search4j.exe -p .\packages\jre -l .\uninstall\uninst.jar
    3636
    3737if exist uninst.flag (
    3838
    39     rd /s /q ..\packages\jre
    40     rmdir ..\packages
     39    rd /s /q packages\jre
     40    rmdir packages
    4141   
    42     if exist ..\bin\windows\search4j.exe (
    43         del ..\bin\windows\search4j.exe
    44         rmdir ..\bin\windows
     42    if exist bin\windows\search4j.exe (
     43        del bin\windows\search4j.exe
     44        rmdir bin\windows
    4545    )
    46     if exist ..\gs2build\bin\windows\search4j.exe (
    47         del ..\gs2build\bin\windows\search4j.exe
    48         rd /s /q ..\gs2build
     46    if exist gs2build\bin\windows\search4j.exe (
     47        del gs2build\bin\windows\search4j.exe
     48        rd /s /q gs2build
    4949    )
    5050       
    51     del uninst.jar
    52     del uninst.flag
    53     del Uninstall.*
    54     del *.uninstall
    55     rmdir /S /Q ..\bin
    56     rmdir /S /Q ..\tmp
    57     rmdir /S /Q ..\ext
     51    del uninstall\uninst.jar
     52    del uninstall\uninst.flag
     53    del uninstall\Uninstall.*
     54    del uninstall\*.uninstall
     55    rmdir /S /Q bin
     56    rmdir /S /Q tmp
     57    rmdir /S /Q ext
    5858   
    59     cd ..
    6059    set GSDEL=!CD!
    61     cd ..
    6260   
    6361    echo @echo off > %TEMP%\gsuninstall.bat
  • main/trunk/release-kits/shared/linux/wrapper.cpp

    r22335 r23256  
    1919        << "Usage: " << progname << " [OPTIONS]" << endl
    2020        << "OPTIONS: " << endl
    21         << " -h, -help          Display this usage message" << endl
    22         << " -text (Depricated) Do a non-graphical command line installation" << endl;
     21        << " -h, -help   Display this usage message" << endl
     22        << " -textonly   Do a non-graphical command line installation" << endl;
     23        << " -extract    Extract the jar file, this can " << endl;
    2324    #ifdef CDROM
    2425    cerr << " -wd PATH          Look for the CD-ROM at PATH" << endl;
     
    4950        } else if ( a.compare("-h") == 0 || a.compare("-help") == 0 || a.compare("--help") == 0) {
    5051            usage( argv[0], 0 );
    51         } else if ( a.compare("-text") == 0 || a.compare("text") == 0 ) {
    52             cerr << "-text is depricated, please use -extract and then run \"java -jar greenstone.jar text\"" << endl;
     52        } else if ( a.compare("-textonly") == 0 || a.compare("-text") == 0 || a.compare("text") == 0 ) {
     53            //cerr << "-text is deprecated, please use -extract and then run \"java -jar greenstone.jar text\"" << endl;
    5354            text_mode = true;
    5455#ifndef CDROM
Note: See TracChangeset for help on using the changeset viewer.