Changeset 28713 for main

Timestamp:

2013-11-28T16:26:52+13:00 (10 years ago)

Author:

ak19

Message:

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

File:

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

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

@@ -37 +37 @@
     
     string scratch = (getenv("TMPDIR") == NULL) ? "/tmp" : getenv("TMPDIR");
-    string tempdir = scratch + "/@projectname@-installer.tmp"; //temporary directory where we will store extracted files
+    string tempdir = scratch + "/greenstone-installer.tmp"; //temporary directory where we will store extracted files
     bool succeeded = false;
     bool text_mode = false;
@@ -51 +51 @@
             usage( argv[0], 0 );
         } 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 @projectname@.jar text\"" << endl;
+            //cerr << "-text is deprecated, please use -extract and then run \"java -jar greenstone.jar text\"" << endl;
             text_mode = true;
 #ifndef CDROM
@@ -58 +58 @@
             cout << "Extracting java installer..." << endl;
             cout << "----------------------------" << endl;
-            bool result = extract_bundled_file( @projectname@jar, sizeof(@projectname@jar), "@projectname@.jar", false);
+            bool result = extract_bundled_file( greenstonejar, sizeof(greenstonejar), "greenstone.jar", false);
             if(result){
                 cout << "\nExtraction Complete" << endl;
-                cout << "You can now run \"java -jar @projectname@.jar text\" to run the installer from the command line\n" << endl;
+                cout << "You can now run \"java -jar greenstone.jar text\" to run the installer from the command line\n" << endl;
                 return 0;
             }
@@ -114 +114 @@
     #ifndef CDROM
 
-    string jarfile = tempdir + "/@projectname@.jar"; //where we will store the jar file
+    string jarfile = tempdir + "/greenstone.jar"; //where we will store the jar file
     string javafile = tempdir + "/@java.installer@"; //where we will store the java tar file
 
@@ -120 +120 @@
     //extract files
     cout << "Extracting installer jar..." << endl;
-    succeeded = extract_bundled_file( @projectname@jar, sizeof(@projectname@jar), (char*)jarfile.c_str(), false);
+    succeeded = extract_bundled_file( greenstonejar, sizeof(greenstonejar), (char*)jarfile.c_str(), false);
 
     #ifdef java_is_bundled
-    cout << "Preparing @projectname@ installer..." << endl;
+    cout << "Preparing Greenstone installer..." << endl;
     succeeded = extract_bundled_file( java, sizeof(java), (char*)javafile.c_str(), true ) && succeeded;
     #endif
@@ -164 +164 @@
 
         //did not find a good java
-        cout << "@projectname@ requires java @java.min.version@ or greater." << endl;
+        cout << "Greenstone requires java @java.min.version@ or greater." << endl;
         
         //tell them if java is absent or just too old
@@ -184 +184 @@
         cout << "Launching Installer ..." << endl;
         int launch_exit_code = 0;
-        launch_exit_code = system( (foundJvm.getExecutable() + " -Xmx200M -jar @projectname@.jar" + (text_mode?" text":"") ).c_str() );
+        launch_exit_code = system( (foundJvm.getExecutable() + " -Xmx200M -jar greenstone.jar" + (text_mode?" text":"") ).c_str() );
 
         //report how it went
@@ -191 +191 @@
         } else {
             cout << "The installer exited with an error" << endl;
-            cout << "@projectname@ may not be correctly installed" << endl;
+            cout << "Greenstone may not be correctly installed" << endl;
         }