units: Fix all jobs commands shellcheck errors

1 files changed, 19 insertions, 17 deletions

diff --git a/units/mobilebroadband/jobs.pxu b/units/mobilebroadband/jobs.pxu
index c7a2ab5..b5ae39c 100644
--- a/units/mobilebroadband/jobs.pxu
+++ b/units/mobilebroadband/jobs.pxu
@@ -10,20 +10,21 @@ user: root
 environ: GSM_CONN_NAME GSM_APN GSM_USERNAME GSM_PASSWORD
 command:
 if [ -n "${GSM_APN}" ]; then
+ # shellcheck disable=SC2064
 trap "nmcli con delete id $GSM_CONN_NAME" EXIT
 create_connection.py mobilebroadband gsm \
- `[ -n "${GSM_APN}" ] && echo "--apn=$GSM_APN"` \
- `[ -n "${GSM_CONN_NAME}" ] && echo "--name=$GSM_CONN_NAME"` \
- `[ -n "${GSM_USERNAME}" ] && echo "--username=$GSM_USERNAME"` \
- `[ -n "${GSM_PASSWORD}" ] && echo "--password=$GSM_PASSWORD"` || exit 1
+ "$([ -n "${GSM_APN}" ] && echo "--apn=$GSM_APN")" \
+ "$([ -n "${GSM_CONN_NAME}" ] && echo "--name=$GSM_CONN_NAME")" \
+ "$([ -n "${GSM_USERNAME}" ] && echo "--username=$GSM_USERNAME")" \
+ "$([ -n "${GSM_PASSWORD}" ] && echo "--password=$GSM_PASSWORD")" || exit 1
 fi
- INTERFACE=`(nmcli -f GENERAL -t dev list 2>/dev/null || nmcli -f GENERAL -t dev show) | tr '\n' ' ' | grep -oP 'TYPE:\Kgsm.*' | sed 's/GENERAL.TYPE:.*//' | grep -oP 'GENERAL.IP-IFACE:\K\S*'`
+ INTERFACE=$( (nmcli -f GENERAL -t dev list 2>/dev/null || nmcli -f GENERAL -t dev show) | tr '\n' ' ' | grep -oP 'TYPE:\Kgsm.*' | sed 's/GENERAL.TYPE:.*//' | grep -oP 'GENERAL.IP-IFACE:\K\S*')
 echo "connected GSM interface seems to be $INTERFACE"
- [ -z $INTERFACE ] && exit 1
- curl http://start.ubuntu.com/connectivity-check.html --interface $INTERFACE
+ [ -z "$INTERFACE" ] && exit 1
+ curl http://start.ubuntu.com/connectivity-check.html --interface "$INTERFACE"
 EXIT_CODE=$?
- if [ -n "${GSM_APN}" ] && [ "`nmcli dev status | awk '/gsm/ {print $3}'`" == "connected" ]; then
- nmcli con down id `[ ${GSM_CONN_NAME} ] && echo "$GSM_CONN_NAME" || echo "MobileBB"`
+ if [ -n "${GSM_APN}" ] && [ "$(nmcli dev status | awk '/gsm/ {print $3}')" == "connected" ]; then
+ nmcli con down id "$([ "${GSM_CONN_NAME}" ] && echo "$GSM_CONN_NAME" || echo "MobileBB")"
 fi
 exit $EXIT_CODE
 _description: Creates a mobile broadband connection for a GSM based modem and checks the connection to ensure it's working. 
@@ -40,19 +41,20 @@ user: root
 environ: CDMA_CONN_NAME CDMA_USERNAME CDMA_PASSWORD
 command:
 if [ -n "${CDMA_USERNAME}" ]; then
+ # shellcheck disable=SC2064
 trap "nmcli con delete id $CDMA_CONN_NAME" EXIT
 create_connection.py mobilebroadband cdma \
- `[ -n "${CDMA_CONN_NAME}" ] && echo "--name=$CDMA_CONN_NAME"` \
- `[ -n "${CDMA_USERNAME}" ] && echo "--username=$CDMA_USERNAME"` \
- `[ -n "${CDMA_PASSWORD}" ] && echo "--password=$CDMA_PASSWORD"` || exit 1
+ "$([ -n "${CDMA_CONN_NAME}" ] && echo "--name=$CDMA_CONN_NAME")" \
+ "$([ -n "${CDMA_USERNAME}" ] && echo "--username=$CDMA_USERNAME")" \
+ "$([ -n "${CDMA_PASSWORD}" ] && echo "--password=$CDMA_PASSWORD")" || exit 1
 fi
- INTERFACE=`(nmcli -f GENERAL -t dev list 2>/dev/null || nmcli -f GENERAL -t dev show) | tr '\n' ' ' | grep -oP 'TYPE:\Kcdma.*' | sed 's/GENERAL.TYPE:.*//' | grep -oP 'GENERAL.IP-IFACE:\K\S*'`
+ INTERFACE=$( (nmcli -f GENERAL -t dev list 2>/dev/null || nmcli -f GENERAL -t dev show) | tr '\n' ' ' | grep -oP 'TYPE:\Kcdma.*' | sed 's/GENERAL.TYPE:.*//' | grep -oP 'GENERAL.IP-IFACE:\K\S*')
 echo "connected CDMA interface seems to be $INTERFACE"
- [ -z $INTERFACE ] && exit 1
- curl http://start.ubuntu.com/connectivity-check.html --interface $INTERFACE
+ [ -z "$INTERFACE" ] && exit 1
+ curl http://start.ubuntu.com/connectivity-check.html --interface "$INTERFACE"
 EXIT_CODE=$?
- if [ -n "${CDMA_USERNAME}" ] && [ "`nmcli dev status | awk '/cdma/ {print $3}'`" == "connected" ]; then
- nmcli con down id `[ ${CDMA_CONN_NAME} ] && echo "$CDMA_CONN_NAME" || echo "MobileBB"`
+ if [ -n "${CDMA_USERNAME}" ] && [ "$(nmcli dev status | awk '/cdma/ {print $3}')" == "connected" ]; then
+ nmcli con down id "$([ "${CDMA_CONN_NAME}" ] && echo "$CDMA_CONN_NAME" || echo "MobileBB")"
 fi
 exit $EXIT_CODE
 _description: Creates a mobile broadband connection for a CDMA based modem and checks the connection to ensure it's working.