Changeset 19765 for release-kits

Timestamp:

2009-06-09T11:23:49+12:00 (15 years ago)

Author:

oranfry

Message:

cdrom installer: added david's function to return the path of a java that will work, copying java off the cd onto disk to make it work where necessary. used it in the wrapper.

File:

• release-kits/shared/linux/wrapper.cpp (modified) (3 diffs)

release-kits/shared/linux/wrapper.cpp

@@ -11 +11 @@
 #include "libsearch4j.h"
 bool extract_bundled_file( const char[], int, char*, bool );
+#else
+string get_full_java( string wd );
 #endif
 
@@ -176 +178 @@
     }
     #else
-        string cmd = wd + "/Java/Linux/jre/bin/java -Dorig.dir=\"" + wd + "\" -jar " + wd + "/Java/Jars/linux.jar" + (text_mode?" text":"");
+        string java_executable = get_full_java( wd );
+        string cmd = java_executable + " -Dorig.dir=\"" + wd + "\" -jar " + wd + "/Java/Jars/linux.jar" + (text_mode?" text":"");
         system( cmd.c_str() );
     #endif
@@ -227 +230 @@
 
 }
+#else
+
+string get_full_java( string wd ) {
+  string full_java = "";
+
+  string cdrom_java = "/Java/Linux/jre/bin/java";
+
+  full_java = wd + cdrom_java;
+  
+  string j1cmd = "\""+full_java+"\" -version >/dev/null 2>&1";
+  int j1status = system(j1cmd.c_str());
+  
+  if (WEXITSTATUS(j1status)!=0) {
+    cerr << "Unable to run Java executable from CD-ROM." << endl;
+    cerr << "This is probably because your CD-ROM was mounted with 'noexec'." << endl;
+    cerr << "It can be changed by a system administrator" << endl << endl;
+    cerr << "Copying Java to local disk so it can be run" << endl;
+    
+    string cdtar_home = wd + "/Java/Linux/";
+    string tcmd = "(cd \"" + cdtar_home + "\" ; tar cf - jre )";
+    tcmd += "| tar xvf - ";
+    tcmd += "| awk 'BEGIN{C=0}{C++; printf(\".\"); if (C%70==0) printf(\"\\n\");}END{printf(\"\\n\")}'";
+
+    int tstatus = system(tcmd.c_str());
+    
+    if (WEXITSTATUS(tstatus)!=0) {
+      cerr << "Failed to copy Java to disk" << endl;
+      cerr << "Please make sure you have write permissions in the directory where you run the installer" << endl;
+    }
+    else {
+      full_java = "./jre/bin/java";
+      string j2cmd = full_java +" -version >/dev/null 2>&1";
+
+      int j2status = system(j2cmd.c_str());
+
+          if (WEXITSTATUS(j2status)!=0) {
+        cerr << "Unable to run copied Java" << endl;
+        system("/bin/rm -rf jre");
+        exit(-1);
+      }
+    }
+  }
+
+  // to get to here, full_java must be set (and working)
+
+  return full_java;
+}
+
 #endif