Show
Ignore:
Timestamp:
28.11.2013 16:26:52 (6 years ago)
Author:
ak19
Message:

Undoing accidental commit on file (wrapper.cpp) not related to revision 28712

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/shared/linux/wrapper.cpp

    r28712 r28713  
    3737     
    3838    string scratch = (getenv("TMPDIR") == NULL) ? "/tmp" : getenv("TMPDIR"); 
    39     string tempdir = scratch + "/@projectname@-installer.tmp"; //temporary directory where we will store extracted files 
     39    string tempdir = scratch + "/greenstone-installer.tmp"; //temporary directory where we will store extracted files 
    4040    bool succeeded = false; 
    4141    bool text_mode = false; 
     
    5151            usage( argv[0], 0 ); 
    5252        } 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 @projectname@.jar text\"" << endl; 
     53            //cerr << "-text is deprecated, please use -extract and then run \"java -jar greenstone.jar text\"" << endl; 
    5454            text_mode = true; 
    5555#ifndef CDROM 
     
    5858            cout << "Extracting java installer..." << endl; 
    5959            cout << "----------------------------" << endl; 
    60             bool result = extract_bundled_file( @projectname@jar, sizeof(@projectname@jar), "@projectname@.jar", false); 
     60            bool result = extract_bundled_file( greenstonejar, sizeof(greenstonejar), "greenstone.jar", false); 
    6161            if(result){ 
    6262                cout << "\nExtraction Complete" << endl; 
    63                 cout << "You can now run \"java -jar @projectname@.jar text\" to run the installer from the command line\n" << endl; 
     63                cout << "You can now run \"java -jar greenstone.jar text\" to run the installer from the command line\n" << endl; 
    6464                return 0; 
    6565            } 
     
    114114    #ifndef CDROM 
    115115 
    116     string jarfile = tempdir + "/@projectname@.jar"; //where we will store the jar file 
     116    string jarfile = tempdir + "/greenstone.jar"; //where we will store the jar file 
    117117    string javafile = tempdir + "/@java.installer@"; //where we will store the java tar file 
    118118 
     
    120120    //extract files 
    121121    cout << "Extracting installer jar..." << endl; 
    122     succeeded = extract_bundled_file( @projectname@jar, sizeof(@projectname@jar), (char*)jarfile.c_str(), false); 
     122    succeeded = extract_bundled_file( greenstonejar, sizeof(greenstonejar), (char*)jarfile.c_str(), false); 
    123123 
    124124    #ifdef java_is_bundled 
    125     cout << "Preparing @projectname@ installer..." << endl; 
     125    cout << "Preparing Greenstone installer..." << endl; 
    126126    succeeded = extract_bundled_file( java, sizeof(java), (char*)javafile.c_str(), true ) && succeeded; 
    127127    #endif 
     
    164164 
    165165        //did not find a good java 
    166         cout << "@projectname@ requires java @java.min.version@ or greater." << endl; 
     166        cout << "Greenstone requires java @java.min.version@ or greater." << endl; 
    167167         
    168168        //tell them if java is absent or just too old 
     
    184184        cout << "Launching Installer ..." << endl; 
    185185        int launch_exit_code = 0; 
    186         launch_exit_code = system( (foundJvm.getExecutable() + " -Xmx200M -jar @projectname@.jar" + (text_mode?" text":"") ).c_str() ); 
     186        launch_exit_code = system( (foundJvm.getExecutable() + " -Xmx200M -jar greenstone.jar" + (text_mode?" text":"") ).c_str() ); 
    187187 
    188188        //report how it went 
     
    191191        } else { 
    192192            cout << "The installer exited with an error" << endl; 
    193             cout << "@projectname@ may not be correctly installed" << endl; 
     193            cout << "Greenstone may not be correctly installed" << endl; 
    194194        } 
    195195