Major refactoring, splitting stuff into separate files.HEADmaster

1 files changed, 11 insertions, 4 deletions

diff --git a/upload.sh b/upload.sh
index 65005bf..981cec3 100755
--- a/upload.sh
+++ b/upload.sh
@@ -7,8 +7,15 @@ basedir=$(pwd)
 cookie=$(cd $dir; echo $(pwd)/.cookie)
 cmd=()
 paths=()
+port=()
 
-for path in $(ls "$dir"/cfg-* "$dir"/*.lua 2>/dev/null)
+if [[ $NODEMCU_PORT != '' ]]
+then
+  port+=(--port)
+  port+=("$NODEMCU_PORT")
+fi
+
+for path in $(ls "$dir"/cfg-* "$dir"/*.lua |grep -v manual_init.lua 2>/dev/null)
 do
   if [[ $path -nt "$cookie" ]]
   then
@@ -20,12 +27,12 @@ done
 
 if [[ ${#cmd[@]} -gt 0 ]]
 then
-  "$basedir/nodemcu-uploader/nodemcu-uploader.py" upload "${cmd[@]}"
+  "$basedir/nodemcu-uploader/nodemcu-uploader.py" "${port[@]}" upload "${cmd[@]}"
 fi
 touch "$cookie"
 
 if [[ -r "$dir/manual_init.lua" ]]
 then
-  cat "$dir/manual_init.lua"
-  "$basedir/nodemcu-uploader/nodemcu-uploader.py" exec "$dir/manual_init.lua"
+#  cat "$dir/manual_init.lua"
+  "$basedir/nodemcu-uploader/nodemcu-uploader.py" "${port[@]}" exec "$dir/manual_init.lua"
 fi