From 23d5590a1efca4ecb31413ef60f55ed5f9af1c88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Ismael=20Haase=20Hern=C3=A1ndez?= Date: Wed, 28 Sep 2011 12:42:01 -0500 Subject: * BUILD_ONLY corrected --- fullpkg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fullpkg b/fullpkg index f242039..cf98331 100755 --- a/fullpkg +++ b/fullpkg @@ -316,7 +316,7 @@ while getopts 'ha:b:cCd:l:nm:r:' arg; do esac done -if ! (( build_only )); then +if ! $build_only; then # Check if we are actually on a build directory. Do this early. if [ ! -r PKGBUILD ]; then @@ -356,7 +356,7 @@ if [ ${level} -eq 0 ]; then fi - if (( build_only )); then + if $build_only; then msg "Building Packages" -- cgit v1.1-4-g5e80 From 430d265dacd0dcbd6724342f5c79f52a9865f6a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Sun, 9 Oct 2011 16:01:45 -0300 Subject: Removed evil -c flag from makechrootpkg --- cleansystem | 3 --- 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 -- cgit v1.1-4-g5e80 From 9b450c03a954af3ed9b861cf212b6c3e0e804a8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Sun, 9 Oct 2011 16:02:14 -0300 Subject: Cleanup version check --- aur | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/aur b/aur index 35783c5..ca7d587 100755 --- a/aur +++ b/aur @@ -76,9 +76,11 @@ for _pkg in ${@}; do fi for _dep in ${depends[@]} ${makedepends[@]}; do + _dep=${_dep/[<>=]*/} if ! is_built $_dep; then if ! find ${ABSROOT} -maxdepth 2 -type d -name "$_dep" | egrep "*" >/dev/null ; then - missing_deps=(${missing_deps} $_dep) + msg2 "$_dep will be get from AUR" + missing_deps+=($_dep) fi else msg2 "$_dep is on repos" -- cgit v1.1-4-g5e80