[PATCH] configuregateway: Only match "function" in subshell

Adrian Schmutzler freifunk at adrianschmutzler.de
Sa Mai 25 14:11:10 CEST 2019


When running OpenWrt master, "type <functionname>" only returns
"<functionname> is a function". Thus, to make the implementation
future-proof and since it is also working with the current state,
change the grep in execute_subshell to match "function".

Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
 src/packages/fff/fff-gateway/Makefile                        | 3 +--
 src/packages/fff/fff-gateway/files/usr/sbin/configuregateway | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/packages/fff/fff-gateway/Makefile b/src/packages/fff/fff-gateway/Makefile
index 7c1dd559..0f0bbb34 100644
--- a/src/packages/fff/fff-gateway/Makefile
+++ b/src/packages/fff/fff-gateway/Makefile
@@ -1,8 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-gateway
-PKG_VERSION:=1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/fff-gateway
 
diff --git a/src/packages/fff/fff-gateway/files/usr/sbin/configuregateway b/src/packages/fff/fff-gateway/files/usr/sbin/configuregateway
index 0f040d79..3ea67e56 100755
--- a/src/packages/fff/fff-gateway/files/usr/sbin/configuregateway
+++ b/src/packages/fff/fff-gateway/files/usr/sbin/configuregateway
@@ -24,7 +24,7 @@ execute_subshell() {
 			unset -f "$1"
 			. "$script"
 
-			if type "$1" | grep -q "shell function"; then
+			if type "$1" | grep -q "function" ; then
 				"$1"
 			fi
 		)
-- 
2.11.0



Mehr Informationen über die Mailingliste franken-dev