separate concerns a bit

The formatting things are unique, different concern from doing network I/O or
uploading.

bin/ns-upload-glucose.sh → bin/mm-format-ns-glucose.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-# Author: Ben West, Maintainer: Scott Leibrand
+# Author: Ben West @bewest
+# Maintainer: Chris Oattes @cjo20
 
 # Written for decocare v0.0.17. Will need updating the the decocare json format changes.
 HISTORY=${1-glucosehistory.json}
@@ -15,5 +16,3 @@ cat $HISTORY | \
   json -e "this.device = 'openaps://medtronic/pump/cgm'" \
   > $OUTPUT
 
-# requires API_SECRET and NIGHTSCOUT_HOST to be set in calling environment (i.e. in crontab)
-curl -s -X POST --data-binary @$OUTPUT -H "API-SECRET: $API_SECRET" -H "content-type: application/json" $NIGHTSCOUT_HOST/api/v1/entries.json >/dev/null && ( touch /tmp/openaps.online && echo "Uploaded $OUTPUT to $NIGHTSCOUT_HOST" ) || echo "Unable to upload to $NIGHTSCOUT_HOST"

bin/ns-upload.sh → bin/mm-format-ns-pump-history.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-# Author: Ben West, Maintainer: Scott Leibrand
+# Author: Ben West
+# Maintainer: Scott Leibrand
 
 HISTORY=${1-pumphistory.json}
 OUTPUT=${2-pumphistory.ns.json}
@@ -15,5 +16,3 @@ cat $HISTORY | \
   > $OUTPUT
 
 
-# requires API_SECRET and NIGHTSCOUT_HOST to be set in calling environment (i.e. in crontab)
-curl -s -X POST --data-binary @$OUTPUT -H "API-SECRET: $API_SECRET" -H "content-type: application/json" $NIGHTSCOUT_HOST/api/v1/entries.json >/dev/null && ( touch /tmp/openaps.online && echo "Uploaded $OUTPUT to $NIGHTSCOUT_HOST" ) || echo "Unable to upload to $NIGHTSCOUT_HOST"

bin/ns-upload-entries.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Author: Ben West
+
+ENTRIES=${1-entries.json}
+NIGHTSCOUT_HOST=${NIGHTSCOUT_HOST-localhost:1337}
+#TZ=${3-$(date +%z)}
+OUTPUT=${2}
+
+export ENTRIES API_SECRET NIGHTSCOUT_HOST
+# requires API_SECRET and NIGHTSCOUT_HOST to be set in calling environment (i.e. in crontab)
+(
+curl -s -X POST --data-binary @$ENTRIES \
+  -H "API-SECRET: $API_SECRET" \
+  -H "content-type: application/json" \
+  $NIGHTSCOUT_HOST/api/v1/entries.json
+) && ( test -n "$OUTPUT" && touch $OUTPUT ; logger "Uploaded $ENTRIES to $NIGHTSCOUT_HOST" ) || logger "Unable to upload to $NIGHTSCOUT_HOST"

package.json

@@ -22,7 +22,10 @@
     "determine-basal" : "./bin/determine-basal.js",
     "send-tempbasal-Azure" : "./bin/send-tempbasal-Azure.js",
     "get-profile" : "./bin/get-profile.js",
-    "bin/reset-wifi-dongle": "bin/reset-wifi-dongle.sh",
+    "reset-wifi-dongle": "bin/reset-wifi-dongle.sh",
+    "mm-format-ns-glucose": "./bin/mm-format-ns-glucose.sh",
+    "mm-format-ns-pump-history": "./bin/mm-format-ns-pump-history.sh",
+    "ns-upload-entries": "./bin/ns-upload-entries.sh",
     "diyps-pebble" : "./bin/diyps-pebble.js"
   },
   "homepage": "https://github.com/openaps/openaps-js"