From 6749a07b4c114613f94aa915f603f00d26c16e0c Mon Sep 17 00:00:00 2001 From: Joshua Ismael Haase Hernández Date: Sun, 5 Jun 2011 22:33:42 -0500 Subject: * libremakepkg copy log if failed. * FULLBUILDCMD use 'no color' option for makepkg --- libremakepkg | 10 +++++++++- libretools.conf | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libremakepkg b/libremakepkg index b0e1371..e83bee7 100755 --- a/libremakepkg +++ b/libremakepkg @@ -40,6 +40,7 @@ function usage { _CLEAN="" CLEAN_CACHE="" update_first="n" +use_log='n' chrootname=${CHCOPY} _PKGINSTALL="" _MAKEPKG_ARGS="" @@ -56,6 +57,8 @@ while getopts ${libremakepkgargs} arg ; do n) chrootname="$OPTARG"; echo $chrootname ;; I) _PKGINSTALL+="-I $OPTARG " ;; M) _MAKEPKG_ARGS+=" $OPTARG" ;; + L) _MAKEPKG_ARGS+=" -$arg $OPTARG" + use_log='y';; *) _MAKEPKG_ARGS+=" -$arg $OPTARG" ;; esac done @@ -84,4 +87,9 @@ fi msg "Creating the package" makechrootpkg $_CLEAN -r ${CHROOTDIR} -l "${chrootname}" $_PKGINSTALL -- $_MAKEPKG_ARGS -exit $? +ev=$? # exit value + +[ $ev -ne 0 -a "$use_log" == 'y' ] && { + cp ${CHROOTDIR}/${chrootname}/build/*.log ./ +} +exit $ev diff --git a/libretools.conf b/libretools.conf index c4ac606..a8ff581 100644 --- a/libretools.conf +++ b/libretools.conf @@ -42,7 +42,7 @@ LIBREDESTDIR=/home/parabolavnx/parabolagnulinux.org/repo LIBRESRCDIR=/home/parabolavnx/parabolagnulinux.org/repo/pkgbuilds ## ABSLibre -ABSLIBREGIT=http://projects.parabolagnulinux.org/abslibre.git/ +ABSLIBREGIT=http://projects.parabolagnulinux.org/abslibre.git ## Commit Command ## Should be git or hg @@ -52,8 +52,8 @@ ABSLIBREGIT=http://projects.parabolagnulinux.org/abslibre.git/ ## Build cmd for fullpkg-ng ## Uncomment one of those or make one of your choice -#FULLBUILDCMD="sudo libremakepkg -siL -M --noconfirm -M --nocheck" -#FULLBUILDCMD="makepkg --noconfirm --nocheck -sciL" +#FULLBUILDCMD="sudo libremakepkg -simL -M --noconfirm -M --nocheck" +#FULLBUILDCMD="makepkg --noconfirm --nocheck -scimL" #FULLBUILDCMD="here is a place for cross-compiling build cmd" # Checks if vars aren't empty -- cgit v1.2.3-54-g00ecf