comparison scripts/update_board.sh @ 428:b27676f871d7 prerelease

Some more sh compatiblity things: no &>, no 'function'

 # It is a bit nasty, but here we need to handle the case that the board may be 
 # in any arbitrarily (bad) condition and try to handle it the best we can
 BELA_IDE_SCREEN_NAME=IDE-Bela
 SCREEN_NAME=Bela
 
-function usage
+usage ()
 {
     THIS_SCRIPT=`basename "$0"`
     echo "Usage: $THIS_SCRIPT [-b path-on-beaglebone] [--clean] [-y]"
 
     echo "

     -b arg : allows to set the path to the Bela folder on the remote end. Use quotes if you use the \"~\" symbol (default: $BBB_BELA_HOME)
     --clean : removes all the files in the $BBB_BELA_HOME folder, INCLUDING any source code you may have in the $BBB_BELA_HOME/projects/ subdirectory.
     -y : does not prompt the user before deleting the remote files.
     "
 }
-trap "echo; exit" SIGINT SIGTERM
 
-function error_handler {
+signal_handler ()
+{
+  echo
+  exit
+}
+
+trap signal_handler SIGINT SIGTERM
+
+error_handler () {
  [ $1 -eq 0 ] && printf "done\n" || { [ -z "$2" ] && printf "\nAn error occurred. Is the board connected?\n" || printf "$2"; exit 1; }
 }
 
 OPTIND=1
 ALWAYS_YES=0

 printf "Creating directory structure on BeagleBone..."
 ssh $BBB_ADDRESS "mkdir -p $BBB_BELA_HOME/build/core $BBB_BELA_HOME/projects"
 error_handler $?
 
 printf "Generating on-board documentation..."
-ssh $BBB_ADDRESS "cd $BBB_BELA_HOME; doxygen &>/dev/null"
+#ssh $BBB_ADDRESS "cd $BBB_BELA_HOME; doxygen &> /dev/null"
 error_handler $? "\nError while generating Doxygen documentation\n"
 
 #-------------
 #Installing IDE
-ls $IDE_FOLDER/scripts/setup_IDE.sh &> /dev/null
+ls $IDE_FOLDER/scripts/setup_IDE.sh >/dev/null 2>/dev/null
 if [ $? -eq 0 ]
 then
-  cd $IDE_FOLDER/scripts && ./setup_IDE.sh -y
+  cd $IDE_FOLDER/scripts && ./setup_IDE.sh -
   # run the IDE 
   ssh $BBB_ADDRESS "make -C $BBB_BELA_HOME --no-print-directory idestart"
 else
   # run the IDE 
   ssh $BBB_ADDRESS "make -C $BBB_BELA_HOME --no-print-directory idestart"
   echo \
 "The Bela core files were updated the board, but a valid IDE folder was not found in $IDE_FOLDER/, so the IDE was not updated. If there was an older version of the IDE on the board, it is being restarted.
-You can get a copy of the most up-to-date IDE files from https://github.com/LBDonovan/bela-ide"
+You can get a copy of the most up-to-date IDE files from https://github.com/LBDonovan/bela-ide
+"
 fi
 
 ssh $BBB_ADDRESS make -C $BBB_BELA_HOME --no-print-directory idestartup nostartup && echo "The board will now run the IDE at startup, but startup of the Bela program has been disabled. To enable it, use the set_startup.sh script"