diff --git a/bin/basestrap.in b/bin/basestrap.in index 25744b3..e305402 100644 --- a/bin/basestrap.in +++ b/bin/basestrap.in @@ -15,7 +15,7 @@ shopt -s extglob DATADIR='@datadir@' LIBDIR='@libdir@' -import ${LIBDIR}/util-msg.sh +[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh import ${LIBDIR}/util.sh import ${LIBDIR}/util-mount.sh import ${LIBDIR}/util-chroot.sh diff --git a/bin/buildiso.in b/bin/buildiso.in index 37f2e04..39fcd4d 100755 --- a/bin/buildiso.in +++ b/bin/buildiso.in @@ -15,7 +15,7 @@ LIBDIR='@libdir@' DATADIR='@datadir@' SYSCONFDIR='@sysconfdir@' -import ${LIBDIR}/util-msg.sh +[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh import ${LIBDIR}/util.sh import ${LIBDIR}/util-iso.sh diff --git a/bin/buildpkg.in b/bin/buildpkg.in index 2dbc6f6..580dbfc 100644 --- a/bin/buildpkg.in +++ b/bin/buildpkg.in @@ -17,7 +17,7 @@ LIBDIR='@libdir@' DATADIR='@datadir@' SYSCONFDIR='@sysconfdir@' -import ${LIBDIR}/util-msg.sh +[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh import ${LIBDIR}/util.sh import ${LIBDIR}/util-chroot.sh import ${LIBDIR}/util-pkg.sh diff --git a/bin/buildtree.in b/bin/buildtree.in index cd05b17..32363a3 100644 --- a/bin/buildtree.in +++ b/bin/buildtree.in @@ -14,7 +14,7 @@ version=@version@ LIBDIR='@libdir@' SYSCONFDIR='@sysconfdir@' -import ${LIBDIR}/util-msg.sh +[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh import ${LIBDIR}/util.sh import ${LIBDIR}/util-pkg-tree.sh diff --git a/bin/check-yaml.in b/bin/check-yaml.in index 051d352..616839b 100644 --- a/bin/check-yaml.in +++ b/bin/check-yaml.in @@ -15,7 +15,7 @@ LIBDIR='@libdir@' DATADIR='@datadir@' SYSCONFDIR='@sysconfdir@' -import ${LIBDIR}/util-msg.sh +[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh import ${LIBDIR}/util.sh import ${LIBDIR}/util-yaml-check.sh import ${LIBDIR}/util-profile.sh diff --git a/bin/checkpkg.in b/bin/checkpkg.in index 9ef661e..dc59347 100644 --- a/bin/checkpkg.in +++ b/bin/checkpkg.in @@ -13,7 +13,7 @@ version=@version@ LIBDIR='@libdir@' -import ${LIBDIR}/util-msg.sh +[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh import ${LIBDIR}/util-pkg.sh shopt -s extglob diff --git a/bin/chroot-run.in b/bin/chroot-run.in index b7f1e0e..4ca0ee5 100644 --- a/bin/chroot-run.in +++ b/bin/chroot-run.in @@ -13,7 +13,7 @@ version=@version@ LIBDIR='@libdir@' -import ${LIBDIR}/util-msg.sh +[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh import ${LIBDIR}/util.sh import ${LIBDIR}/util-mount.sh diff --git a/bin/deployiso.in b/bin/deployiso.in index 65d6aba..6e096d0 100644 --- a/bin/deployiso.in +++ b/bin/deployiso.in @@ -14,7 +14,7 @@ version=@version@ LIBDIR='@libdir@' SYSCONFDIR='@sysconfdir@' -import ${LIBDIR}/util-msg.sh +[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh import ${LIBDIR}/util.sh import ${LIBDIR}/util-publish.sh diff --git a/bin/find-libdeps.in b/bin/find-libdeps.in index cde52bb..b0fd172 100644 --- a/bin/find-libdeps.in +++ b/bin/find-libdeps.in @@ -13,7 +13,7 @@ version=@version@ LIBDIR='@libdir@' -import ${LIBDIR}/util-msg.sh +[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh import ${LIBDIR}/util-pkg.sh set -e diff --git a/bin/finddeps.in b/bin/finddeps.in index cba665a..416ac47 100644 --- a/bin/finddeps.in +++ b/bin/finddeps.in @@ -13,7 +13,7 @@ version=@version@ LIBDIR='@libdir@' -import ${LIBDIR}/util-msg.sh +[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh match=$1 if [[ -z $match ]]; then diff --git a/bin/fstabgen.in b/bin/fstabgen.in index 8a4d7c9..601915e 100644 --- a/bin/fstabgen.in +++ b/bin/fstabgen.in @@ -15,7 +15,7 @@ shopt -s extglob LIBDIR='@libdir@' -import ${LIBDIR}/util-msg.sh +[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh import ${LIBDIR}/util-fstab.sh write_source() { diff --git a/bin/lddd.in b/bin/lddd.in index 94c9c3d..f271fd8 100644 --- a/bin/lddd.in +++ b/bin/lddd.in @@ -13,7 +13,7 @@ version=@version@ LIBDIR='@libdir@' -import ${LIBDIR}/util-msg.sh +[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh ifs=$IFS IFS="${IFS}:" diff --git a/bin/manjaro-chroot.in b/bin/manjaro-chroot.in index f12aab5..a0e0e83 100644 --- a/bin/manjaro-chroot.in +++ b/bin/manjaro-chroot.in @@ -16,7 +16,7 @@ shopt -s extglob LIBDIR='@libdir@' SYSCONFDIR='@sysconfdir@' -import ${LIBDIR}/util-msg.sh +[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh import ${LIBDIR}/util.sh import ${LIBDIR}/util-mount.sh diff --git a/bin/mkchroot.in b/bin/mkchroot.in index 4127f43..4c0efc9 100644 --- a/bin/mkchroot.in +++ b/bin/mkchroot.in @@ -13,7 +13,7 @@ version=@version@ LIBDIR='@libdir@' -import ${LIBDIR}/util-msg.sh +[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh import ${LIBDIR}/util.sh import ${LIBDIR}/util-chroot.sh diff --git a/bin/mkchrootpkg.in b/bin/mkchrootpkg.in index cf763ac..99ce185 100644 --- a/bin/mkchrootpkg.in +++ b/bin/mkchrootpkg.in @@ -13,7 +13,7 @@ version=@version@ LIBDIR='@libdir@' -import ${LIBDIR}/util-msg.sh +[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh import ${LIBDIR}/util.sh import ${LIBDIR}/util-chroot.sh diff --git a/bin/signfile.in b/bin/signfile.in index 9dae5d9..4e276a4 100644 --- a/bin/signfile.in +++ b/bin/signfile.in @@ -13,7 +13,7 @@ version=@version@ LIBDIR='@libdir@' -import ${LIBDIR}/util-msg.sh +[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh import ${LIBDIR}/util.sh load_user_info diff --git a/lib/util-msg.sh b/lib/util-msg.sh index 401161e..d4bd1b8 100644 --- a/lib/util-msg.sh +++ b/lib/util-msg.sh @@ -115,10 +115,10 @@ die() { cleanup 255 } -# import(){ -# if [[ -r "$1" ]];then -# source "$1" -# else -# die 'Could not import %s' "$1" -# fi -# } +import(){ + if [[ -r "$1" ]];then + source "$1" + else + die 'Could not import %s' "$1" + fi +}