More robust startup script

muesli · Apr 15, 2017 · 09c12b9 · 09c12b9
1 parent 6aeb69c
commit 09c12b9
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/script/build-app b/script/build-app
@@ -30,10 +30,13 @@ if [ "$OS_NAME" = "darwin" ]; then
 
   cat > $BIN_PATH/Beehive << "EOF"
 #!/bin/bash
+set -e
+
 BASE_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd )"
 LIBRARY_PATH=$HOME/Library/Application\ Support/Beehive
 mkdir -p $LIBRARY_PATH
-$BASE_PATH/beehived --config $LIBRARY_PATH/beehive.conf &
+$BASE_PATH/beehived --config "$LIBRARY_PATH/beehive.conf" &
+trap "killall beehived" EXIT
 $BASE_PATH/Beehive.bin
 EOF
   chmod +x build/app/Beehive-$OS_NAME-$OS_ARCH/Beehive.app/Contents/MacOS/Beehive