diff options
| -rwxr-xr-x | functions.sh | 10 | ||||
| -rwxr-xr-x | helpers/lh_config | 5 |
2 files changed, 15 insertions, 0 deletions
diff --git a/functions.sh b/functions.sh index 2ef04bb..547000a 100755 --- a/functions.sh +++ b/functions.sh @@ -2,7 +2,17 @@ LH_BASE="${LH_BASE:-/usr/share/live-helper}" +# Source global functions for FUNCTION in "${LH_BASE}"/functions/*.sh do . "${FUNCTION}" done + +# Source local functions +if [ -d scripts/functions ] +then + for FUNCTION in scripts/functions/*.sh + do + . "${FUNCTION}" + done +fi diff --git a/helpers/lh_config b/helpers/lh_config index b9114bf..9cbabf6 100755 --- a/helpers/lh_config +++ b/helpers/lh_config @@ -210,6 +210,11 @@ Local_arguments () rmdir --ignore-fail-on-non-empty config fi + if [ -d scripts/functions ] + then + rmdir --ignore-fail-on-non-empty scripts/functions + fi + if [ -d scripts ] then rmdir --ignore-fail-on-non-empty scripts |