no error on delete non exist file - rename files & dir

marelab · Jan 16, 2018 · b84f25b · b84f25b
1 parent acdb718
commit b84f25b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/compiledbin/latest.bin b/compiledbin/latest.bin
diff --git a/compiledbin/latestspiffs.bin b/compiledbin/latestspiffs.bin
diff --git a/spiffs_src/required.css → datafiles/required.css b/spiffs_src/required.css → datafiles/required.css
diff --git a/spiffs_src/required.js → datafiles/required.js b/spiffs_src/required.js → datafiles/required.js
diff --git a/platformio.ini b/platformio.ini
@@ -23,7 +23,7 @@ board = nodemcuv2
 lib_deps =
  ${common.lib_deps_builtin}
  ${common.lib_deps_external}
-extra_scripts = extra_script.py
+extra_scripts = scripts/pio_script.py
 
 [env:nodemcuv2_mqtt]
 platform = ${common.platform}
@@ -35,7 +35,7 @@ lib_deps =
  https://github.com/knolleary/pubsubclient
 build_flags =
  -D MQTT
-extra_scripts = extra_script.py
+extra_scripts = scripts/pio_script.py
 
 [env:d1_mini]
 platform = ${common.platform}
@@ -44,5 +44,5 @@ board = d1_mini
 lib_deps =
  ${common_env_data.lib_deps_builtin}
  ${common_env_data.lib_deps_external}
-extra_scripts = extra_script.py
+extra_scripts = scripts/pio_script.py
 
diff --git a/extra_script.py → scripts/pio_script.py b/extra_script.py → scripts/pio_script.py
@@ -12,12 +12,15 @@
 #
 
 def before_buildfs(source, target, env):
- os.remove('./data/required.css.gz');
- os.remove('./data/required.js.gz');
- with open('./spiffs_src/required.css', 'rb') as f_in:
+ try:
+ os.remove('./data/required.css.gz');
+ os.remove('./data/required.js.gz');
+ except OSError:
+ pass 
+ with open('./datafiles/required.css', 'rb') as f_in:
  with gzip.open('./data/required.css.gz', 'wb') as f_out:
  shutil.copyfileobj(f_in, f_out)
- with open('./spiffs_src/required.js', 'rb') as f_in:
+ with open('./datafiles/required.js', 'rb') as f_in:
  with gzip.open('./data/required.js.gz', 'wb') as f_out:
  shutil.copyfileobj(f_in, f_out)