From 909d1edd02022f2f8a8fbdb0161181ce0daada08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Ismael=20Haase=20Hern=C3=A1ndez?=
 <hahj87@gmail.com>
Date: Sun, 5 Jun 2011 22:12:48 -0500
Subject: * Built packages is not an error

---
 fullpkg | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'fullpkg')

diff --git a/fullpkg b/fullpkg
index 410584a..dfdba45 100755
--- a/fullpkg
+++ b/fullpkg
@@ -274,9 +274,8 @@ function _pkg_build () {
     }
 
     pkgs=$(cat $build_dir/log | tr " " "\n" | grep "built:") && {
-        error "Those packages were built and installed:"
+        msg "Those packages were built and installed:"
         echo ${pkgs[@]} | tr " " "\n" | cut -d: -f2
-        msg "Uploading packages to the server"
     }
 
     pkgs=$(cat $build_dir/log | tr " " "\n" | grep "failed:") && {
@@ -291,7 +290,7 @@ function _pkg_build () {
 
     popd > /dev/null
 }
-## END FUNCTIONS ##
+###### END FUNCTIONS ######
 
 force_build=""
 level=0
@@ -318,10 +317,19 @@ while getopts 'ha:bcCd:l:nm:r:' arg; do
     esac
 done
 
+[ ! -r PKGBUILD ] && {
+    error "This isn't a build directory"
+    usage && exit 1
+}
+
+## if $level = 20 there is highly likely there are circular deps
+[ $level -eq $max_level -o $level -gt $max_level ] && exit 20
+
 # Only on level 0
 [ $level -eq 0 ] && {
 # if build_dir exist use it, else make a build_dir
     build_dir=${build_dir:-$(mktemp -d /tmp/fullpkg.XXXXXX)}
+    mkdir -p $build_dir
 
 # cleanup if the option was used.
     [ $do_cleanup == 'y' ] && {
@@ -356,15 +364,6 @@ done
     msg "Checking dependencies"
 }
 
-[ ! -r PKGBUILD ] && {
-    error "This isn't a build directory"
-    usage && exit 1
-}
-
-## if $level = 20 there is highly likely there are circular deps
-[ $level -eq $max_level -o $level -gt $max_level ] && exit 20
-
-
 find_deps || { 
     # if find_deps finds circular deps
     # it should exit with status 20
-- 
cgit v1.2.2


From 51c9918206763265d2df42050e241f7f12f1b9df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Ismael=20Haase=20Hern=C3=A1ndez?=
 <hahj87@gmail.com>
Date: Mon, 13 Jun 2011 21:47:05 -0500
Subject: use mv -f for $files.2

---
 fullpkg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'fullpkg')

diff --git a/fullpkg b/fullpkg
index 88bbe15..55f9cdb 100755
--- a/fullpkg
+++ b/fullpkg
@@ -81,7 +81,7 @@ remove_queue() {
     get_queue
 
     grep -Evw "^$(basename $PWD)" ${queue_file} > ${queue_file}2
-    mv ${queue_file}2 ${queue_file}
+    mv -f ${queue_file}2 ${queue_file}
 
     put_queue && return 0 || return $?
 }
@@ -111,7 +111,7 @@ check_queue() {
 # $2 buildorder file
 remove_buildorder() {
   grep -Evw "${1}" ${2} > ${2}2
-  mv ${2}2 ${2}
+  mv -f ${2}2 ${2}
 }
 
 # Guesses the repo name according to the parent dir of the current package
@@ -452,7 +452,7 @@ find_deps || {
               egrep -w "$search" ${buildorder} >> ${build_dir}/banned
 # Take banned packages out from buildorder
               egrep -vw "$search" ${buildorder} > ${buildorder}2
-              mv ${buildorder}2 ${buildorder}
+              mv -f ${buildorder}2 ${buildorder}
               unset search
             }
         }
-- 
cgit v1.2.2