include JSON.sh as a git submodule

- easier to update from upstream and also includes its license file)
- move push-exitcode.sh to the same helpers subfolder as JSON.sh
- move set -e further down in pushbullet-bash
- give an error message if JSON.sh has not been checked out

Author: fbartels

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "helpers/JSON.sh"]
+	path = helpers/JSON.sh
+	url = https://github.com/dominictarr/JSON.sh.git

JSON.sh

@@ -0,0 +1 @@
+helpers/JSON.sh/JSON.sh

JSON.sh

@@ -1,8 +1,5 @@
 #! /bin/bash
 
-# avoid "EXPECTED value GOT EOF" errors when no pushes are returned
-set -e
-
 # Bash interface to the PushBullet api.
 # Author: Red5d - https://github.com/Red5d
 
@@ -26,11 +23,17 @@ err() {
 }
 
 if [ ! "$(which curl)" ]; then
-	err "pushbullet-bash requires curl to run. Please install curl"
+	err "pushbullet-bash requires curl to run. Please install curl."
 	exit 1
 fi
 
-# override default PB_CONFIG if different file or API key has been given
+if [ ! -e "$PROGDIR"/JSON.sh ]; then
+	err "Not all required libraries are installed. Please change into the pushbullet-bash folder and run the following command:"
+	err "git submodule init && git submodule update"
+	exit
+fi
+
+# use default PB_CONFIG if no different file or API key has been given
 if [[ ! -n "$PB_CONFIG" ]] && [[ ! -n "$PB_API_KEY" ]]; then
 	PB_CONFIG=~/.config/pushbullet
 fi
@@ -42,6 +45,9 @@ if [[ -z "$PB_API_KEY" ]] && [[ "$1" != "setup" ]]; then
 	exit 1
 fi
 
+# from here on set -e to avoid "EXPECTED value GOT EOF" errors from JSON.sh when no pushes are returned
+set -e
+
 printUsage() {
 echo "Usage: pushbullet [-q|--quiet|-d|--debug] <action> <device> <type> <data>