From: Jonatan Schlag <jonatan.schlag@ipfire.org>
Date: Wed, 19 Jul 2017 08:23:20 +0000 (+0200)
Subject: config: improve config_get_id_from_config and config_get_hook_from_config
X-Git-Tag: 009~162
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2ec74678c5cfd12a0d156d0163d736133107db82;p=people%2Fms%2Fnetwork.git

config: improve config_get_id_from_config and config_get_hook_from_config

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/functions/functions.config b/src/functions/functions.config
index e11a1c2b..6a148c7a 100644
--- a/src/functions/functions.config
+++ b/src/functions/functions.config
@@ -58,8 +58,7 @@ config_get_id_from_config() {
 	assert [ $# -eq 1 ]
 	local config=${1}
 
-	local hook=$(config_get_hook_from_config ${config})
-	echo "${config//"${hook}."/}"
+	echo "${config##*.}"
 
 }
 
@@ -69,5 +68,5 @@ config_get_hook_from_config() {
 	assert [ $# -eq 1 ]
 	local config=${1}
 
-	echo "${config//.*[[:digit:]]/}"
+	echo "${config%%.*[[:digit:]]}"
 }