Skip to content

Fixed to support Big Sur #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 2, 2021
Merged

Fixed to support Big Sur #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
be191b4
Changed for Big Sur support
bergdahl Jan 22, 2021
2800b79
Updated docs
bergdahl Jan 30, 2021
c6533c1
Revert README
bergdahl Feb 2, 2021
da81c49
Revert README
bergdahl Feb 2, 2021
554807b
Merge branch 'master' of https://github.com/bergdahl/arduino-esp32fs-…
bergdahl Feb 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions make.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 1 addition & 3 deletions src/ESP32FS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down