From 6d04ada06ce29868338face2fbbec8ab72c48dd2 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Thu, 15 Oct 2015 18:34:07 +0200
Subject: wip

---
 upload.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'upload.sh')

diff --git a/upload.sh b/upload.sh
index 0a7ca8c..221bedd 100755
--- a/upload.sh
+++ b/upload.sh
@@ -12,7 +12,7 @@ for path in $(ls "$dir"/cfg-* "$dir"/*.lua)
 do
   if [[ $path -nt "$cookie" ]]
   then
-    filename=`basename $path`
+    filename=$(echo $path | sed -e 's,.*/\(.*\),\1,' -e 's,\.debug,,')
     cmd+=("$path:$filename")
     paths+=("$path")
   fi
@@ -20,8 +20,11 @@ done
 
 if [[ ${#cmd[@]} -gt 0 ]]
 then
-  "$basedir/nodemcu-uploader/nodemcu-uploader.py" --baud 115200 upload "${cmd[@]}"
+  "$basedir/nodemcu-uploader/nodemcu-uploader.py" upload "${cmd[@]}"
 fi
 touch "$cookie"
 
-echo "require('main').main();"
+if [[ -r "$dir/manual_init.lua" ]]
+then
+  cat "$dir/manual_init.lua"
+fi
-- 
cgit v1.2.3