Merge pull request #3 from bergdahl/master

Fixed to support Big Sur
lorol · Feb 2, 2021 · ce5fbd2 · ce5fbd2
2 parents a188a60 + 554807b
commit ce5fbd2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/make.sh b/make.sh
@@ -5,9 +5,9 @@ if [[ -z "$INSTALLDIR" ]]; then
 fi
 echo "INSTALLDIR: $INSTALLDIR"
 
-pde_path=`find ../../../ -name pde.jar`
-core_path=`find ../../../ -name arduino-core.jar`
-lib_path=`find ../../../ -name commons-codec-1.7.jar`
+pde_path=`find /Applications/Arduino.app/ -name pde.jar`
+core_path=`find /Applications/Arduino.app/ -name arduino-core.jar`
+lib_path=`find /Applications/Arduino.app/ -name commons-codec-1.7.jar`
 if [[ -z "$core_path" || -z "$pde_path" ]]; then
     echo "Some java libraries have not been built yet (did you run ant build?)"
     return 1
@@ -19,7 +19,7 @@ echo "lib_path: $lib_path"
 set -e
 
 mkdir -p bin
-javac -target 1.8 -cp "$pde_path:$core_path:$lib_path" \
+javac -source 1.8 -target 1.8 -cp "$pde_path:$core_path:$lib_path" \
       -d bin src/ESP32FS.java
 
 pushd bin

diff --git a/src/ESP32FS.java b/src/ESP32FS.java
@@ -202,15 +202,13 @@ private void createAndUpload(){
     String toolExtension = ".py";
     if(PreferencesData.get("runtime.os").contentEquals("windows")) {
       toolExtension = ".exe";
-    } else if(PreferencesData.get("runtime.os").contentEquals("macosx")) {
-      toolExtension = "";
     }
 
     String pythonCmd;
     if(PreferencesData.get("runtime.os").contentEquals("windows"))
         pythonCmd = "python.exe";
     else
-        pythonCmd = "python";
+        pythonCmd = "python3";
 
     String mkspiffsCmd;
     if(PreferencesData.get("runtime.os").contentEquals("windows"))