diff options
author | Trygve Laugstøl <trygvis@inamo.no> | 2015-10-15 18:34:07 +0200 |
---|---|---|
committer | Trygve Laugstøl <trygvis@inamo.no> | 2015-10-15 18:34:07 +0200 |
commit | 6d04ada06ce29868338face2fbbec8ab72c48dd2 (patch) | |
tree | 537ea335a906f7b8ef177ac435433a40b3731b50 /upload.sh | |
parent | d9da54abcc784ecca5e1c0c415820a32e68c2296 (diff) | |
download | esp-playground-6d04ada06ce29868338face2fbbec8ab72c48dd2.tar.gz esp-playground-6d04ada06ce29868338face2fbbec8ab72c48dd2.tar.bz2 esp-playground-6d04ada06ce29868338face2fbbec8ab72c48dd2.tar.xz esp-playground-6d04ada06ce29868338face2fbbec8ab72c48dd2.zip |
wip
Diffstat (limited to 'upload.sh')
-rwxr-xr-x | upload.sh | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -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 |