Changeset 22324 for main/trunk/release-kits/shared

Timestamp:

2010-06-30T10:05:54+12:00 (14 years ago)

Author:

sjm84

Message:

Fixed an error with the -extract option on linux

File:

• main/trunk/release-kits/shared/linux/wrapper.cpp (modified) (1 diff)

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

@@ -53 +53 @@
             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);
+            cout << "----------------------------" << endl;
+            cout << "Extracting java installer..." << endl;
+            cout << "----------------------------" << endl;
+            bool result = extract_bundled_file( greenstonejar, sizeof(greenstonejar), "greenstone.jar", 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"
+                cout << "You can now run \"java -jar greenstone.jar text\" to run the installer from the command line\n" << endl;
                 return 0;
             }
             else{
-                cerr << "There was an error while extracting the java installer" << endl;
+                cerr << "\nThere was an error while extracting the java installer" << endl;
                 return 1;
             }