From b36ef29900b42da2702ac3fb084a26df2340de2d Mon Sep 17 00:00:00 2001 From: r00t Date: Thu, 23 Jul 2015 03:49:14 -0400 Subject: [PATCH] some minor modifications.. --- lib/00-depcheck.func.sh | 6 ++++-- lib/01-mk.chroot.func.sh | 2 +- lib/prereqs/Arch/pkgs | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/00-depcheck.func.sh b/lib/00-depcheck.func.sh index 8f356f8..5d25c0d 100755 --- a/lib/00-depcheck.func.sh +++ b/lib/00-depcheck.func.sh @@ -31,8 +31,8 @@ function so_check_me_out { break 2 fi done - set -e fi + set -e # Sanity is important. if [[ -z "${HOST_DIST}" ]]; @@ -64,8 +64,10 @@ function so_check_me_out { echo "Please ensure you are connected to the Internet/have repositories configured correctly." exit 1 fi + set -e fi + set +e while read pkgname; do eval "${PKG_CHK}" >> "${LOGFILE}.${FUNCNAME}" 2>&1 @@ -83,8 +85,8 @@ function so_check_me_out { fi fi done < ${PKGLIST} - set -e + rm -f "${LOCKFILE}" } diff --git a/lib/01-mk.chroot.func.sh b/lib/01-mk.chroot.func.sh index 091b420..65f93d8 100755 --- a/lib/01-mk.chroot.func.sh +++ b/lib/01-mk.chroot.func.sh @@ -359,7 +359,7 @@ EOF echo "Done." - rm -f ${LOCKFILE} + #rm -f ${LOCKFILE} echo "Chroot setup complete." diff --git a/lib/prereqs/Arch/pkgs b/lib/prereqs/Arch/pkgs index 868374b..2ca857f 100644 --- a/lib/prereqs/Arch/pkgs +++ b/lib/prereqs/Arch/pkgs @@ -1,5 +1,6 @@ binutils curl +dosfstools findutils gcc-libs-multilib gcc-multilib