Merge pull request #407 from radical-cybertools/fix/expr_cmd

updated `expr` usage for env funcs extraction
radical-cybertools · May 21, 2024 · 52964c6 · 52964c6
2 parents 7c86772 + 766d268
commit 52964c6
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/bin/radical-utils-env.sh b/bin/radical-utils-env.sh
@@ -215,8 +215,9 @@ env_prep(){
 
             # handle bash function definitions
             v=$(grep -e "^$k=" $src | cut -f 2- -d= | sed -e 's/{ /{\n/')
-            func=$(expr "$k" : '^BASH_FUNC_\(.*\)\(()\|%%\)$')
-            if ! test -z "$func"
+            func=$(expr "$k" : '^BASH_FUNC_\(.*\)()$' \
+                     \| "$k" : '^BASH_FUNC_\(.*\)%%$')
+            if ! test -z "$func" && ! test "$func" = 0
             then
                 functions="$func $v\nexport -f $func\n\n$functions"
             else