From f0f010772d651e09f957f9b47057e81e7737ad45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Ismael=20Haase=20Hern=C3=A1ndez?= Date: Thu, 2 Jun 2011 13:31:17 -0500 Subject: fullpkg shows guessed dir libretools.conf has reordered repos before community --- fullpkg | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'fullpkg') diff --git a/fullpkg b/fullpkg index 14c4e9f..a95f59d 100755 --- a/fullpkg +++ b/fullpkg @@ -161,11 +161,12 @@ function find_deps { # if search pkgname in repo doesn't work # this should find pkgsplits - elif _dir=($(find "$ABSROOT/${_repo}" -type f -name PKGBUILD -print0 | \ - "xargs" -0 -e grep -HEw "pkgname=|pkgbase=|provides=" | grep $_dep 2>&1)); + elif _dir=($(find "$ABSROOT/${_repo}" -type f -name PKGBUILD -print0 2>/dev/null | \ + "xargs" -0 -e grep -HEw "pkgname=|pkgbase=|provides=" | grep -w "$_dep" 2>&1)); then + _dir=$(dirname $(echo $_dir | cut -d: -f1)) plain "guess for $_dep -> $_dir" - pushd $(dirname $(echo $_dir | cut -d: -f1)) > /dev/null + pushd $_dir > /dev/null $0 -c -d ${build_dir} -l ${next_level} # Circular deps must fail [ $? -eq 20 ] && return 20 -- cgit v1.2.3 From 407d3f31705ce09a6b2f0623205de2cd8c991400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Ismael=20Haase=20Hern=C3=A1ndez?= Date: Sun, 5 Jun 2011 18:06:39 -0500 Subject: * remove_queue to use "grep -E" --- fullpkg | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'fullpkg') diff --git a/fullpkg b/fullpkg index a95f59d..410584a 100755 --- a/fullpkg +++ b/fullpkg @@ -10,7 +10,7 @@ source /usr/bin/libremessages [ -r $XDG_CONFIG_HOME/libretools/libretools.conf ] && \ source $XDG_CONFIG_HOME/libretools/libretools.conf -## START FUNCTIONS ## +##### START FUNCTIONS ##### function usage { echo "cd to a dir containing a PKGBUILD and run:" @@ -67,7 +67,7 @@ update_queue() { remove_queue() { get_queue - grep -vw "^$(basename $PWD)" $queue_file > $queue_file.2 + grep -Evw "^$(basename $PWD)" $queue_file > $queue_file.2 mv $queue_file.2 $queue_file put_queue && return 0 || return $? @@ -238,20 +238,21 @@ function _pkg_build () { # this buildcmd is on libretools.conf $FULLBUILDCMD; r=$? case $r in - 0) plain "The build was succesful." - source .INFO && [ -n $repo ] && { - librestage $repo || { - echo "unstaged:$(basename $PWD)" >> $build_dir/log +###### Succesfull Build ###### + 0) + plain "The build was succesful." + source .INFO && [ -n $repo ] && { + librestage $repo || { + echo "unstaged:$(basename $PWD)" >> $build_dir/log + } } - } - echo "built:$(basename $PWD)" >> $build_dir/log - cleanup "$(basename $PWD)" - ;; - 1) error "There were errors while trying to build the package." - echo "failed:$(basename $PWD)" >> $build_dir/log + echo "built:$(basename $PWD)" >> $build_dir/log + cleanup "$(basename $PWD)" ;; - 2) error "The build failed." - echo "failed:$(basename $PWD)" >> $build_dir/log +###### Failed Build ###### + *) + error "There were errors while trying to build the package." + echo "failed:$(basename $PWD)" >> $build_dir/log ;; esac -- cgit v1.2.3 From 3505f337fcabdc51c1c165587ae77b70a0161614 Mon Sep 17 00:00:00 2001 From: Nicolas Reynolds Date: Tue, 7 Jun 2011 13:29:32 -0300 Subject: fullpkg still needs local releasing --- fullpkg | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'fullpkg') diff --git a/fullpkg b/fullpkg index 410584a..a668b45 100755 --- a/fullpkg +++ b/fullpkg @@ -242,6 +242,10 @@ function _pkg_build () { 0) plain "The build was succesful." source .INFO && [ -n $repo ] && { +# Release locally + mipsrelease *.pkg.tar.?z + +# Stage for releasing librestage $repo || { echo "unstaged:$(basename $PWD)" >> $build_dir/log } -- cgit v1.2.3 From 6d20859e305d5998358ee61d93741600fafd0b4e Mon Sep 17 00:00:00 2001 From: Nicolas Reynolds Date: Tue, 7 Jun 2011 13:39:37 -0300 Subject: fullpkg needs to update the repo dbs after local release --- fullpkg | 3 +++ 1 file changed, 3 insertions(+) (limited to 'fullpkg') diff --git a/fullpkg b/fullpkg index a668b45..f281df3 100755 --- a/fullpkg +++ b/fullpkg @@ -249,6 +249,9 @@ function _pkg_build () { librestage $repo || { echo "unstaged:$(basename $PWD)" >> $build_dir/log } + + msg "Updating pacman db and packages" + sudo pacman -Syu --noconfirm } echo "built:$(basename $PWD)" >> $build_dir/log cleanup "$(basename $PWD)" -- cgit v1.2.3