diff --git a/bin/basestrap.in b/bin/basestrap.in index 85f3b31..5e2c5f2 100644 --- a/bin/basestrap.in +++ b/bin/basestrap.in @@ -15,8 +15,6 @@ shopt -s extglob DATADIR='@datadir@' LIBDIR='@libdir@' -[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} - 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 e944405..b84908b 100755 --- a/bin/buildiso.in +++ b/bin/buildiso.in @@ -15,8 +15,6 @@ LIBDIR='@libdir@' DATADIR='@datadir@' SYSCONFDIR='@sysconfdir@' -[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} - import ${LIBDIR}/util.sh import ${LIBDIR}/util-iso.sh diff --git a/bin/buildpkg.in b/bin/buildpkg.in index a02d41e..d9328ec 100644 --- a/bin/buildpkg.in +++ b/bin/buildpkg.in @@ -17,8 +17,6 @@ LIBDIR='@libdir@' DATADIR='@datadir@' SYSCONFDIR='@sysconfdir@' -[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} - 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 b8edfc8..321dc38 100644 --- a/bin/buildtree.in +++ b/bin/buildtree.in @@ -14,7 +14,6 @@ version=@version@ LIBDIR='@libdir@' SYSCONFDIR='@sysconfdir@' -[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} import ${LIBDIR}/util.sh import ${LIBDIR}/util-pkg-tree.sh diff --git a/bin/check-yaml.in b/bin/check-yaml.in index afb7b00..b3f546d 100644 --- a/bin/check-yaml.in +++ b/bin/check-yaml.in @@ -15,8 +15,6 @@ LIBDIR='@libdir@' DATADIR='@datadir@' SYSCONFDIR='@sysconfdir@' -[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} - 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 6deb31c..394e7d2 100644 --- a/bin/checkpkg.in +++ b/bin/checkpkg.in @@ -13,8 +13,6 @@ version=@version@ LIBDIR='@libdir@' -[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} - import ${LIBDIR}/util-pkg.sh shopt -s extglob diff --git a/bin/chroot-run.in b/bin/chroot-run.in index 10be8b8..8baf71d 100644 --- a/bin/chroot-run.in +++ b/bin/chroot-run.in @@ -13,8 +13,6 @@ version=@version@ LIBDIR='@libdir@' -[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} - import ${LIBDIR}/util.sh import ${LIBDIR}/util-mount.sh diff --git a/bin/deployiso.in b/bin/deployiso.in index 34dc018..916c5a6 100644 --- a/bin/deployiso.in +++ b/bin/deployiso.in @@ -14,8 +14,6 @@ version=@version@ LIBDIR='@libdir@' SYSCONFDIR='@sysconfdir@' -[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} - import ${LIBDIR}/util.sh import ${LIBDIR}/util-publish.sh diff --git a/bin/find-libdeps.in b/bin/find-libdeps.in index c368217..f536d92 100644 --- a/bin/find-libdeps.in +++ b/bin/find-libdeps.in @@ -13,8 +13,6 @@ version=@version@ LIBDIR='@libdir@' -[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} - import ${LIBDIR}/util-pkg.sh set -e diff --git a/bin/finddeps.in b/bin/finddeps.in index 2701f55..83154af 100644 --- a/bin/finddeps.in +++ b/bin/finddeps.in @@ -11,8 +11,6 @@ version=@version@ -[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} - match=$1 if [[ -z $match ]]; then diff --git a/bin/fstabgen.in b/bin/fstabgen.in index e308352..1260381 100644 --- a/bin/fstabgen.in +++ b/bin/fstabgen.in @@ -15,8 +15,6 @@ shopt -s extglob LIBDIR='@libdir@' -[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} - import ${LIBDIR}/util-fstab.sh write_source() { diff --git a/bin/lddd.in b/bin/lddd.in index 7a9931d..472af14 100644 --- a/bin/lddd.in +++ b/bin/lddd.in @@ -11,8 +11,6 @@ version=@version@ -[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} - ifs=$IFS IFS="${IFS}:" diff --git a/bin/manjaro-chroot.in b/bin/manjaro-chroot.in index 062cd24..1b5c96f 100644 --- a/bin/manjaro-chroot.in +++ b/bin/manjaro-chroot.in @@ -16,8 +16,6 @@ shopt -s extglob LIBDIR='@libdir@' SYSCONFDIR='@sysconfdir@' -[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} - import ${LIBDIR}/util.sh import ${LIBDIR}/util-mount.sh diff --git a/bin/mkchroot.in b/bin/mkchroot.in index 8176d08..ce98168 100644 --- a/bin/mkchroot.in +++ b/bin/mkchroot.in @@ -13,8 +13,6 @@ version=@version@ LIBDIR='@libdir@' -[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} - import ${LIBDIR}/util.sh import ${LIBDIR}/util-chroot.sh diff --git a/bin/mkchrootpkg.in b/bin/mkchrootpkg.in index ad1ad7c..bbf3ce2 100644 --- a/bin/mkchrootpkg.in +++ b/bin/mkchrootpkg.in @@ -13,8 +13,6 @@ version=@version@ LIBDIR='@libdir@' -[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} - import ${LIBDIR}/util.sh import ${LIBDIR}/util-chroot.sh diff --git a/bin/signfile.in b/bin/signfile.in index c16459d..033d7e4 100644 --- a/bin/signfile.in +++ b/bin/signfile.in @@ -13,8 +13,6 @@ version=@version@ LIBDIR='@libdir@' -[[ -r ${MANJARO_MSG_LIB} ]] && source ${MANJARO_MSG_LIB} - import ${LIBDIR}/util.sh load_user_info