except
This commit is contained in:
parent
51de08aaa3
commit
8fb0750b59
1 changed files with 7 additions and 9 deletions
|
@ -62,7 +62,7 @@ main_source_directory() {
|
||||||
local path="${1}"
|
local path="${1}"
|
||||||
if [ -d "${path}" ]; then
|
if [ -d "${path}" ]; then
|
||||||
local cmd count ifs module modules
|
local cmd count ifs module modules
|
||||||
modules="$(sh_source_find "${path}")"
|
modules="$(sh_source_find "${path}" "main.sh")"
|
||||||
ifs="${IFS}"
|
ifs="${IFS}"
|
||||||
IFS="
|
IFS="
|
||||||
"
|
"
|
||||||
|
@ -74,7 +74,6 @@ main_source_directory() {
|
||||||
#printf "%02d" "${count}"
|
#printf "%02d" "${count}"
|
||||||
_sh_main_log "${module%.sh}"
|
_sh_main_log "${module%.sh}"
|
||||||
module="${path}/${module}"
|
module="${path}/${module}"
|
||||||
if [ "${module}" != "${ENV}" ]; then
|
|
||||||
# shellcheck disable=SC1090
|
# shellcheck disable=SC1090
|
||||||
. "${module}"
|
. "${module}"
|
||||||
cmd="$(_sh_main_commands "${module}")"
|
cmd="$(_sh_main_commands "${module}")"
|
||||||
|
@ -83,7 +82,6 @@ main_source_directory() {
|
||||||
"
|
"
|
||||||
CMD="${CMD}${cmd}"
|
CMD="${CMD}${cmd}"
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
IFS="${ifs}"
|
IFS="${ifs}"
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue