Changeset 22225 for main/trunk/release-kits

Timestamp:

2010-06-03T10:04:19+12:00 (14 years ago)

Author:

sjm84

Message:

Implemented the extract option for web installer

File:

• main/trunk/release-kits/shared/linux/wrapper.cpp (modified) (2 diffs)

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

@@ -20 +20 @@
         << "OPTIONS: " << endl
         << " -h, -help          Display this usage message" << endl
-        << " -text              Do a non-graphical command line installation" << endl;
+        << " -text (Depricated) Do a non-graphical command line installation" << endl;
     #ifdef CDROM
     cerr << " -wd PATH          Look for the CD-ROM at PATH" << endl;
@@ -50 +50 @@
             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;
             text_mode = true;
+        } else if ( a.compare("-extract") == 0 || a.compare("--extract") || a.compare("-x")) {
+            cout << "------------------------------" << endl;
+            cout << "Extracting java installer...\n" << endl;
+            cout << "------------------------------" << endl;
+            bool result = extract_bundled_file( greenstonejar, sizeof(greenstonejar), (char*)jarfile.c_str(), false);
+            if(result){
+                cout << "\nExtraction Complete" << endl;
+                cout << "You can now run \"java -jar greenstone.jar text\" to run the installer from the command line\n"
+                return 0;
+            }
+            else{
+                cerr << "There was an error while extracting the java installer" << endl;
+                return 1;
+            }
         } else {
             cerr << "Unrecognised option '" << a << "'" << endl;