Merge branch 'master' into smart-cleanup

Conflicts:
	update-cleansystem

1 files changed, 13 insertions, 4 deletions

diff --git a/treepkg b/treepkg
index a22df71..8c4cc8e 100755
--- a/treepkg
+++ b/treepkg
@@ -18,12 +18,15 @@
 source /etc/libretools.conf
 source $XDG_CONFIG_HOME/libretools/libretools.conf >/dev/null 2>&1|| true
 
+term_title "$(basename $0)"
+
 # Get system variables
 source /etc/makepkg.conf
 source $HOME/makepkg.conf >/dev/null 2>&1|| true
 
 # End inmediately but print an useful message
 trap_exit() {
+  term_title "error!"
   error "($(basename $0)) $@ (leftovers on ${BUILDDIR})"
   exit 1
 }
@@ -134,10 +137,12 @@ if ! ${BUILDNOW}; then
     touch "${BUILDORDER}"
 
 # If this package is already built quit silently
-    if is_built "${pkgbase}" "${fullver}"; then
-      add_order "ignore"
-      exit 0
-    fi
+    for _pkg in ${pkgname[@]}; do
+      if is_built "${_pkg}" "${fullver}"; then
+        add_order "ignore"
+        exit 0
+      fi
+    done
 
 # Ignore if already in build order
     egrep -q ";${pkgbase};" "${BUILDORDER}" && exit 0
@@ -199,6 +204,9 @@ if [ ${DEPTH} -eq 0 ]; then
 
       ${VERBOSE} && msg "Building ${_pkg/_/ }" || true
 
+# Remove leading zeros and space if any
+      term_title "$(echo ${_pkg/_/ } | sed "s/^0\+ \?//")"
+
 # Run build command
       pushd "${BUILDDIR}/${_pkg}" >/dev/null
         sudo pacman -Syu --noconfirm
@@ -225,4 +233,5 @@ fi
 
 fi
 
+term_title "done"
 exit $?