]> git.ipfire.org Git - people/ms/network.git/commitdiff
config: improve config_get_id_from_config and config_get_hook_from_config
authorJonatan Schlag <jonatan.schlag@ipfire.org>
Wed, 19 Jul 2017 08:23:20 +0000 (10:23 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 19 Jul 2017 17:09:30 +0000 (19:09 +0200)
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/functions/functions.config

index e11a1c2b1736f4eabea78c3809f31f6a83dfffa0..6a148c7a3bb492ebc31b10b6f27e240a06449edd 100644 (file)
@@ -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:]]}"
 }