diff options
| -rw-r--r-- | cleansystem | 3 | ||||
| -rwxr-xr-x | libremakepkg | 40 |
2 files changed, 14 insertions, 29 deletions
diff --git a/cleansystem b/cleansystem index 5c44d17..3f92b95 100644 --- a/cleansystem +++ b/cleansystem @@ -124,6 +124,3 @@ wpa_supplicant xfsprogs xz zlib -libgssglue -libtirpc - diff --git a/libremakepkg b/libremakepkg index ef72526..bac9e30 100755 --- a/libremakepkg +++ b/libremakepkg @@ -136,9 +136,7 @@ if [ ${UID} -ne 0 ]; then fi if [ ! -r PKGBUILD ]; then # Check if we are actually on a build directory. Do this early. - - error "This isn't a build directory"; usage - + error "This isn't a build directory"; usage fi msg "Checking PKGBUILD for non-free issues" @@ -156,33 +154,23 @@ fi buildenv msg "Creating the package" -if [ -d "${CHROOTDIR}/${CHROOTNAME}" ]; then # use chroot - - if [ "${CLEAN_FIRST}" = 'y' ]; then - msg "Cleaning" - clean_chroot - fi - - if [ "${UPDATE_FIRST}" = 'y' ]; then - msg "Updating the chroot in use..." - mkarchroot -c ${CACHEDIR} -u "${CHROOTDIR}/${CHROOTNAME}" # -c option is for cache - fi - - makechrootpkg -r "${CHROOTDIR}" -l "${CHROOTNAME}" -- "${MAKEPKG_ARGS}" - ev=$? # exit value - -else # build new chroot before using - - if [ "${UPDATE_FIRST}" = 'y' ]; then # update CHROOT - msg "Updating the chroot in use..." - mkarchroot -c ${CACHEDIR} -u "${CHROOTDIR}/${CHROOT}" # -c option is for cache - fi +if [ ! -d "${CHROOTDIR}/${CHROOTNAME}" ]; then # use chroot + mkarchroot -c ${CACHEDIR} -u "${CHROOTDIR}/${CHROOT}" # -c option is for cache +fi - makechrootpkg -c -r "${CHROOTDIR}" -l "${CHROOTNAME}" -- "${MAKEPKG_ARGS}" - ev=$? # exit value +if [ "${CLEAN_FIRST}" = 'y' ]; then + msg "Cleaning" + clean_chroot +fi +if [ "${UPDATE_FIRST}" = 'y' ]; then + msg "Updating the chroot in use..." + mkarchroot -c ${CACHEDIR} -u "${CHROOTDIR}/${CHROOTNAME}" # -c option is for cache fi +makechrootpkg -r "${CHROOTDIR}" -l "${CHROOTNAME}" -- "${MAKEPKG_ARGS}" +ev=$? # exit value + copy_log exit $ev |