EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

treewide: fix shellscript syntax errors/typos

Browse Source 
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>
This commit is contained in:
Lorenzo Santina 2017-09-11 15:27:53 +02:00 committed by Mathias Kresin
parent fb128057da
commit fd84ecda7d
10 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/kernel/mac80211/Makefile
View File

@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=mac80211 PKG_NAME:=mac80211
PKG_VERSION:=2017-01-31 PKG_VERSION:=2017-01-31
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
PKG_BACKPORT_VERSION:= PKG_BACKPORT_VERSION:=
PKG_HASH:=75e6d39e34cf156212a2509172a4a62b673b69eb4a1d9aaa565f7fa719fa2317 PKG_HASH:=75e6d39e34cf156212a2509172a4a62b673b69eb4a1d9aaa565f7fa719fa2317

2
package/kernel/mac80211/files/lib/wifi/mac80211.sh
View File

@ -92,7 +92,7 @@ detect_mac80211() {
htmode="VHT80" 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 if [ -x /usr/bin/readlink -a -h /sys/class/ieee80211/${dev} ]; then
path="$(readlink -f /sys/class/ieee80211/${dev}/device)" path="$(readlink -f /sys/class/ieee80211/${dev}/device)"

2
package/network/config/gre/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gre PKG_NAME:=gre
PKG_VERSION:=1 PKG_VERSION:=1
PKG_RELEASE:=7 PKG_RELEASE:=8
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
package/network/config/gre/files/gre.sh
View File

@ -25,7 +25,7 @@ gre_generic_setup() {
json_add_string mode "$mode" json_add_string mode "$mode"
json_add_int mtu "${mtu:-1280}" json_add_int mtu "${mtu:-1280}"
[ -n "$df" ] && json_add_boolean df "$df" [ -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" [ -n "$tos" ] && json_add_string tos "$tos"
json_add_boolean multicast "$multicast" json_add_boolean multicast "$multicast"
json_add_string local "$local" json_add_string local "$local"

2
package/network/services/hostapd/Makefile
View File

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=hostapd PKG_NAME:=hostapd
PKG_RELEASE:=4 PKG_RELEASE:=5
PKG_SOURCE_URL:=http://w1.fi/hostap.git PKG_SOURCE_URL:=http://w1.fi/hostap.git
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git

2
package/network/services/hostapd/files/hostapd.sh
View File

@ -627,7 +627,7 @@ wpa_supplicant_add_network() {
scan_ssid="" 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 case "$auth_type" in
none) ;; none) ;;

2
package/network/utils/comgt/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=comgt PKG_NAME:=comgt
PKG_VERSION:=0.32 PKG_VERSION:=0.32
PKG_RELEASE:=29 PKG_RELEASE:=30
PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
PKG_SOURCE_URL:=@SF/comgt PKG_SOURCE_URL:=@SF/comgt

2
package/network/utils/comgt/files/3g.sh
View File

@ -109,4 +109,4 @@ proto_3g_teardown() {
proto_kill_command "$interface" proto_kill_command "$interface"
} }
[ -z "NOT_INCLUDED" ] || add_protocol 3g [ -z "$NOT_INCLUDED" ] || add_protocol 3g

3
package/network/utils/comgt/files/directip.sh
View File

@ -44,8 +44,7 @@ proto_directip_setup() {
return 1 return 1
} }
cardinfo=$(gcom -d "$device" -s /etc/gcom/getcardinfo.gcom) gcom -d "$device" -s /etc/gcom/getcardinfo.gcom | grep -q "Sierra Wireless" || {
[ -n $(echo "$cardinfo" | grep -q "Sierra Wireless") ] || {
proto_notify_error "$interface" BAD_DEVICE proto_notify_error "$interface" BAD_DEVICE
proto_block_restart "$interface" proto_block_restart "$interface"
return 1 return 1

2
scripts/om-fwupgradecfg-gen.sh
View File

@ -1,4 +1,4 @@
#/bin/sh #!/bin/sh
# #
# Copyright (C) 2011 OpenWrt.org # Copyright (C) 2011 OpenWrt.org
# #