Fix OSX for v0.6 build

nickroethemeier · Apr 29, 2019 · 13aa348 · 13aa348
1 parent 7cba665
commit 13aa348
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 __pycache__
 build
 dist
+.DS_Store
diff --git a/build_osx.sh b/build_osx.sh
@@ -1,2 +1,6 @@
+echo "Marking Execute bit on Java JRE binary"
+chmod +x src/osx-jre/bin/java
+echo "Building Package using PyInstaller"
 python3 -m PyInstaller ./uDRAC_osx.spec --onefile --windowed
+echo "Copying rest of JRE, JARs and libs to .app file"
 cp -R dist/uDRAC\ OSX/* dist/uDRAC\ OSX.app/Contents/MacOS/
diff --git a/src/uDRAC.py b/src/uDRAC.py
@@ -75,7 +75,7 @@ def connC6100(host):
 		cmd = '"'+scrpath+'/lin-jre/bin/java" -cp "'+scrpath+'/c6100/JViewer.jar" -Djava.library.path="'+scrpath+'/c6100/lib" com.ami.kvm.jviewer.JViewer '+ JNLPhost + " " + JNLPport + " " + JNLPtoken
 		os.system(cmd + " &")
 	elif opsys == "Darwin":
-		cmd = scrpath+'/osx-jre/bin/java -cp "'+scrpath+'/c6100/JViewer.jar" com.ami.kvm.jviewer.JViewer '+ JNLPhost + " " + JNLPport + " " + JNLPtoken
+		cmd = '"'+scrpath+'/osx-jre/bin/java" -cp "'+scrpath+'/c6100/JViewer.jar" com.ami.kvm.jviewer.JViewer '+ JNLPhost + " " + JNLPport + " " + JNLPtoken
 		os.system(cmd + " &")
 
 	if debugmsg == 1: