treewide: fix shellscript syntax errors/typos
authorLorenzo Santina <lorenzo.santina@edu.unito.it>
Mon, 11 Sep 2017 13:27:53 +0000 (15:27 +0200)
committerMathias Kresin <dev@kresin.me>
Wed, 13 Sep 2017 06:07:39 +0000 (08:07 +0200)
Fix multiple syntax errors in shelscripts (of packages only)
These errors were causing many conditions to not working properly

Signed-off-by: Lorenzo Santina <lorenzo.santina@edu.unito.it>
[increase PKG_RELEASE, drop command substitution from directip.sh]
Signed-off-by: Mathias Kresin <dev@kresin.em>
package/kernel/mac80211/Makefile
package/kernel/mac80211/files/lib/wifi/mac80211.sh
package/network/config/gre/Makefile
package/network/config/gre/files/gre.sh
package/network/services/hostapd/Makefile
package/network/services/hostapd/files/hostapd.sh
package/network/utils/comgt/Makefile
package/network/utils/comgt/files/3g.sh
package/network/utils/comgt/files/directip.sh
scripts/om-fwupgradecfg-gen.sh

index 8ec05a3..3a96472 100644 (file)
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=mac80211
 
 PKG_VERSION:=2017-01-31
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
 PKG_BACKPORT_VERSION:=
 PKG_HASH:=75e6d39e34cf156212a2509172a4a62b673b69eb4a1d9aaa565f7fa719fa2317
index 4bfc742..940fb52 100644 (file)
@@ -92,7 +92,7 @@ detect_mac80211() {
                        htmode="VHT80"
                }
 
-               [ -n $htmode ] && ht_capab="set wireless.radio${devidx}.htmode=$htmode"
+               [ -n "$htmode" ] && ht_capab="set wireless.radio${devidx}.htmode=$htmode"
 
                if [ -x /usr/bin/readlink -a -h /sys/class/ieee80211/${dev} ]; then
                        path="$(readlink -f /sys/class/ieee80211/${dev}/device)"
index 90f92d4..9193f5c 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gre
 PKG_VERSION:=1
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
index cd327ea..3301cee 100755 (executable)
@@ -25,7 +25,7 @@ gre_generic_setup() {
        json_add_string mode "$mode"
        json_add_int mtu "${mtu:-1280}"
        [ -n "$df" ] && json_add_boolean df "$df"
-       [ -n "ttl" ] && json_add_int ttl "$ttl"
+       [ -n "$ttl" ] && json_add_int ttl "$ttl"
        [ -n "$tos" ] && json_add_string tos "$tos"
        json_add_boolean multicast "$multicast"
        json_add_string local "$local"
index b7cc6b9..8a1f083 100644 (file)
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostapd
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE_URL:=http://w1.fi/hostap.git
 PKG_SOURCE_PROTO:=git
index 57d74d8..5340b56 100644 (file)
@@ -620,7 +620,7 @@ wpa_supplicant_add_network() {
                scan_ssid=""
        }
 
-       [[ "$_w_mode" = "adhoc" -o "$_w_mode" = "mesh" ]] && append network_data "$_w_modestr" "$N$T"
+       [ "$_w_mode" = "adhoc" -o "$_w_mode" = "mesh" ] && append network_data "$_w_modestr" "$N$T"
 
        case "$auth_type" in
                none) ;;
index 3926016..ce99a2a 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=comgt
 PKG_VERSION:=0.32
-PKG_RELEASE:=28
+PKG_RELEASE:=29
 
 PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=@SF/comgt
index d438cb7..0d02d4c 100644 (file)
@@ -109,4 +109,4 @@ proto_3g_teardown() {
        proto_kill_command "$interface"
 }
 
-[ -z "NOT_INCLUDED" ] || add_protocol 3g
+[ -z "$NOT_INCLUDED" ] || add_protocol 3g
index 381bfb0..3452fa5 100644 (file)
@@ -44,8 +44,7 @@ proto_directip_setup() {
                return 1
        }
 
-       cardinfo=$(gcom -d "$device" -s /etc/gcom/getcardinfo.gcom)
-       [ -n $(echo "$cardinfo" | grep -q "Sierra Wireless") ] || {
+       gcom -d "$device" -s /etc/gcom/getcardinfo.gcom | grep -q "Sierra Wireless" || {
                proto_notify_error "$interface" BAD_DEVICE
                proto_block_restart "$interface"
                return 1
index a96adf9..4960149 100644 (file)
@@ -1,4 +1,4 @@
-#/bin/sh
+#!/bin/sh
 #
 # Copyright (C) 2011 OpenWrt.org
 #