Mercurial > hg > beaglert
changeset 532:53ce8eac833c prerelease
Merge
| author | chnrx <chris.heinrichs@gmail.com> |
|---|---|
| date | Thu, 23 Jun 2016 20:41:22 +0100 |
| parents | ddb86944e138 (current diff) fcf36d293458 (diff) |
| children | 2ec36efb2c52 |
| files | |
| diffstat | 3 files changed, 5 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Thu Jun 23 20:40:05 2016 +0100 +++ b/Makefile Thu Jun 23 20:41:22 2016 +0100 @@ -255,14 +255,6 @@ runscreenfg: stop $(OUTPUT_FILE) @echo "Running $(RUN_COMMAND) in a screen" @cd $(RUN_FROM) && screen -S $(SCREEN_NAME) -m $(RUN_COMMAND) -FIFO_NAME=/tmp/belafifo -runscreenfifo: ## Same as runscreen, but stdout and stderr are piped to the foreground through a fifo -runscreenfifo: stop $(OUTPUT_FILE) - @echo "Running $(RUN_COMMAND), piping output to $(FIFO_NAME)" - @rm -rf $(FIFO_NAME) - @mkfifo $(FIFO_NAME) - @cd $(RUN_FROM) && screen -S $(SCREEN_NAME) -d -m stdbuf -e 0 -i 0 -o 0 bash -c "$(RUN_COMMAND) &> $(FIFO_NAME)" - @cat /tmp/belafifo STARTUP_COMMAND=printf "\#!/bin/sh\n\#\n\# This file is autogenerated by Bela. Do not edit!\n\necho Running Bela...\nscreen -S $(SCREEN_NAME) -d -m %s $(RUN_COMMAND) %s\n" nostartup: ## No Bela project runs at startup @@ -386,4 +378,4 @@ echo Update succesful $(LOG); \ ' $(LOG) -.PHONY: all clean distclean help projectclean nostartup startup startuploop debug run runfg runscreen runscreenfg runscreenfifo stop idestart idestop idestartup idenostartup ideconnect connect update checkupdate updateunsafe +.PHONY: all clean distclean help projectclean nostartup startup startuploop debug run runfg runscreen runscreenfg stop idestart idestop idestartup idenostartup ideconnect connect update checkupdate updateunsafe
--- a/scripts/.bela_common Thu Jun 23 20:40:05 2016 +0100 +++ b/scripts/.bela_common Thu Jun 23 20:41:22 2016 +0100 @@ -36,7 +36,7 @@ check_board_alive(){ printf "Checking the board is up and running at $BBB_ADDRESS..." - ssh -o ConnectTimeout=10 $BBB_ADDRESS exit && printf "done\n" || { + ssh -o StrictHostKeyChecking=no -o ConnectTimeout=10 $BBB_ADDRESS exit && printf "done\n" || { printf "\nERROR: the board does not respond at $BBB_ADDRESS, check that the address is correct and the board is connected.\n"; exit 1; }
--- a/scripts/update_board Thu Jun 23 20:40:05 2016 +0100 +++ b/scripts/update_board Thu Jun 23 20:41:22 2016 +0100 @@ -96,11 +96,11 @@ done - +echo $BBB_ADDRESS check_board_alive # Check if destination folder exists # the StrictHostKeyChecking no should prevent the unkown host prompt -ssh -o "StrictHostKeyChecking no" $BBB_ADDRESS [ -d $BBB_BELA_HOME ] && DESTINATION_EMPTY=0 || DESTINATION_EMPTY=1 +ssh $BBB_ADDRESS [ -d $BBB_BELA_HOME ] && DESTINATION_EMPTY=0 || DESTINATION_EMPTY=1 # Set the date on the board [ $FULL -eq 1 ] && set_date @@ -194,8 +194,7 @@ then export BBB_ADDRESS BBB_BELA_HOME cd $IDE_FOLDER/scripts && ./update_IDE $ALWAYS_YES_FLAG --no-frills - - ssh $BBB_ADDRESS "make -C $BBB_BELA_HOME --no-print-directory idestart" + [ $FULL -eq 1 ] && ssh $BBB_ADDRESS "make -C $BBB_BELA_HOME --no-print-directory idestart" else # run the IDE printf "\nThe Bela core files were updated on the board, but a valid IDE folder was not found in $IDE_FOLDER/, so the IDE was not updated.