bump to version 0.9.3

Makefile

@@ -1,4 +1,4 @@
-V=0.9.2
+V=0.9.3
 
 PREFIX = /usr/local
 
@@ -36,7 +36,6 @@ CONFIGFILES = \
 LIBS = \
 	lib/util.sh \
 	lib/util-mount.sh \
-	lib/util-build.sh \
 	lib/util-msg.sh
 
 all: $(BINPROGS) bin/bash_completion bin/zsh_completion

PKGBUILD

@@ -12,7 +12,7 @@ makedepends=('git')
 provides=('devtools' 'arch-install-scripts' 'manjaro-tools')
 conflicts=('devtools' 'arch-install-scripts' 'manjaro-tools')
 backup=('etc/manjaro-tools/manjaro-tools.conf')
-source=("git+$url.git")
+source=("git+$url.git#branch=devel")
 sha256sums=('SKIP')
 
 pkgver() {

bin/bash_completion.in

@@ -1,14 +1,14 @@
-_manjaro_tools_compgen() {
-  local i r
-  COMPREPLY=($(compgen -W '$*' -- "$cur"))
-  for ((i=1; i < ${#COMP_WORDS[@]}-1; i++)); do
-    for r in ${!COMPREPLY[@]}; do
-      if [[ ${COMP_WORDS[i]} = ${COMPREPLY[r]} ]]; then
-        unset 'COMPREPLY[r]'; break
-      fi
-    done
-  done
-}
+# _manjaro_tools_compgen() {
+#   local i r
+#   COMPREPLY=($(compgen -W '$*' -- "$cur"))
+#   for ((i=1; i < ${#COMP_WORDS[@]}-1; i++)); do
+#     for r in ${!COMPREPLY[@]}; do
+#       if [[ ${COMP_WORDS[i]} = ${COMPREPLY[r]} ]]; then
+#         unset 'COMPREPLY[r]'; break
+#       fi
+#     done
+#   done
+# }
 
 _mkchrootpkg() {
   local cur
@@ -48,7 +48,7 @@ _mkchroot() {
 } &&
 complete -F _mkchroot mkchroot
 
-_chroot-run() {
+_chroot_run() {
   local cur
   COMPREPLY=()
   _get_comp_words_by_ref cur
@@ -65,9 +65,9 @@ _chroot-run() {
 
   true
 } &&
-complete -F _chroot-run chroot-run
+complete -F _chroot_run chroot-run
 
-_build-set() {
+_build_set() {
   local cur
   COMPREPLY=()
   _get_comp_words_by_ref cur
@@ -84,7 +84,7 @@ _build-set() {
 
   true
 } &&
-complete -F _build-set build-set
+complete -F _build_set build-set
 
 
 # ex:et ts=2 sw=2 ft=sh

bin/build-set.in

@@ -15,7 +15,6 @@ shopt -s nullglob
 
 [[ -r @libdir@/util-msg.sh ]] && source @libdir@/util-msg.sh
 [[ -r @libdir@/util.sh ]] && source @libdir@/util.sh
-[[ -r @libdir@/util-build.sh ]] && source @libdir@/util-build.sh
 
 display_settings(){
     msg "manjaro-tools version: ${version}"
@@ -32,7 +31,7 @@ display_settings(){
     msg "PATHS:"
     msg2 "chrootdir: ${chrootdir}"
     msg2 "profiledir: ${profiledir}"
-    msg2 "pkgdir: ${pkgdir}"
+    msg2 "pkgdir: ${pkg_dir}"
     msg2 "pacman_conf: ${pacman_conf}"
     msg2 "makepkg_conf: ${makepkg_conf}"
     msg2 "pm_conf: ${pm_conf}"
@@ -89,6 +88,23 @@ chroot_create(){
 	    ${base_packages[*]} || abort
 }
 
+chroot_clean(){
+    for copy in "${chrootdir}"/*; do
+	[[ -d ${copy} ]] || continue
+	msg2 "Deleting chroot copy '$(basename "${copy}")'..."
+
+	lock 9 "${copy}.lock" "Locking chroot copy '${copy}'"
+
+	if [[ "$(stat -f -c %T "${copy}")" == btrfs ]]; then
+	    { type -P btrfs && btrfs subvolume delete "${copy}"; } &>/dev/null
+	fi
+	rm -rf --one-file-system "${copy}"
+    done
+    exec 9>&-
+    
+    rm -rf --one-file-system "${chrootdir}"
+}
+
 chroot_update(){
     lock 9 "${chrootdir}/root.lock" "Locking clean chroot"
     chroot-run ${mkchroot_args[*]} \
@@ -96,19 +112,46 @@ chroot_update(){
 	      pacman -Syu --noconfirm || abort
 }
 
-prepare_dir(){
-    mkdir -p "${pkgdir}"
-    chown -R "${pkg_owner}:users" "${pkgdir_loaded}"
+clean_up(){
+    msg "Cleaning up ..."
+    
+    local query=$(find ${pkg_dir} -maxdepth 1 -name "*.*")
+    
+    [[ -n $query ]] && rm -v $query
+    
+    if [[ -z $LOGDEST ]];then
+	query=$(find $PWD -maxdepth 2 -name '*.log')
+	[[ -n $query ]] && rm -v $query
+    fi
+    
+    if [[ -z $SRCDEST ]];then
+	query=$(find $PWD -maxdepth 2 -name '*.?z?')
+	[[ -n $query ]] && rm -v $query
+    fi
+}
+
+blacklist_pkg(){
+    local blacklist=('libsystemd') \
+    cmd=$(pacman -Q ${blacklist[@]} -r $1/root 2> /dev/null)
+    
+    if [[ -n $cmd ]] ; then
+	chroot-run $1/root pacman -Rdd "${blacklist[@]}" --noconfirm
+    fi
+}
+
+prepare_cachedir(){
+    mkdir -p "${pkg_dir}"
+    chown -R "${pkg_owner}:users" "${pkg_dir_loaded}"
 }
 
 move_pkg(){
     local ext='pkg.tar.xz'
     if [[ -n $PKGDEST ]];then
-	mv $PKGDEST/*{any,$arch}.${ext} ${pkgdir}/
+	mv $PKGDEST/*{any,$arch}.${ext} ${pkg_dir}/
     else
-	mv *.${ext} ${pkgdir}
+	mv *.${ext} ${pkg_dir}
     fi
-    chown -R "${pkg_owner}:users" "${pkgdir_loaded}"
+    chown -R "${pkg_owner}:users" "${pkg_dir_loaded}"
 }
 
 chroot_build(){
@@ -140,7 +183,7 @@ chroot_build(){
 chroot_init(){
     if ${clean_first} || [[ ! -d "${chrootdir}" ]]; then
 	msg "Creating chroot for [${branch}] (${arch})..."
-	chroot_clean "${chrootdir}"
+	chroot_clean
 	chroot_create
     else
 	msg "Updating chroot for [${branch}] (${arch})..."
@@ -149,7 +192,7 @@ chroot_init(){
 }
 
 sign_pkgs(){
-    cd $pkgdir
+    cd $pkg_dir
     su "${pkg_owner}" <<'EOF'
 signpkgs
 EOF
@@ -205,7 +248,7 @@ opts='p:a:b:r:cwnsqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-	p) profile="$OPTARG" ;;
+	p) profile="$OPTARG";  ;;
 	a) arch="$OPTARG" ;;
 	b) branch="$OPTARG" ;;
 	r) chroots="$OPTARG" ;;
@@ -225,8 +268,8 @@ if [[ "$arch" == 'multilib' ]]; then
 fi
 
 chrootdir=${chroots}/${branch}/${arch}
-pkgdir_loaded=${pkgdir}
-pkgdir="${pkgdir}/${branch}/${arch}"
+pkg_dir_loaded=${pkg_dir}
+pkg_dir="${pkg_dir}/${branch}/${arch}"
 
 pacman_conf="@pkgdatadir@/pacman-${pacman_conf_arch}.conf"
 makepkg_conf="@pkgdatadir@/makepkg-${arch}.conf"
@@ -240,7 +283,7 @@ makepkg_args+=("${@:$OPTIND}")
 
 check_root "$0" "${orig_argv[@]}"
 
-[[ -d "${pkgdir}" ]] || prepare_dir "${pkg_owner}"
+[[ -d "${pkg_dir}" ]] || prepare_cachedir
 
 eval_profile "${profile}"
 

bin/find-libdeps.in

@@ -55,7 +55,7 @@ case $script_mode in
 	provides) find_args="-name *.so*";;
 esac
 
-find . -type f $find_args | while read filename; do
+find $PWD -type f $find_args | while read filename; do
 	if [[ $script_mode = "provides" ]]; then
 		# ignore if we don't have a shared object
 		if ! LC_ALL=C readelf -h "$filename" 2>/dev/null | grep -q '.*Type:.*DYN (Shared object file).*'; then

bin/finddeps.in

@@ -23,7 +23,7 @@ if [[ -z $match ]]; then
 	exit 1
 fi
 
-find . -type d | while read d; do
+find $PWD -type d | while read d; do
 	if [[ -f "$d/PKGBUILD" ]]; then
 		unset pkgname depends makedepends optdepends
 		. "$d/PKGBUILD"

conf/manjaro-tools.conf

@@ -9,8 +9,8 @@
 # default branch
 # branch=stable
 
-# pkgdir where to move built pkgs
-# pkgdir=/var/cache/manjaro-tools/pkg
+# pkg cache where to move built pkgs
+# pkg_dir=/var/cache/manjaro-tools
 
 # default set; name without .set extension
 # profile=default

lib/util-build.sh

@@ -9,47 +9,46 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-clean_up(){
-    msg "Cleaning up ..."
-    
-    local query=$(find ${pkgdir} -maxdepth 1 -name "*.*")
-    
-    [[ -n $query ]] && rm -v $query
-    
-    if [[ -z $LOGDEST ]];then
-	query=$(find $PWD -maxdepth 2 -name '*.log')
-	[[ -n $query ]] && rm -v $query
-    fi
-    
-    if [[ -z $SRCDEST ]];then
-	query=$(find $PWD -maxdepth 2 -name '*.?z?')
-	[[ -n $query ]] && rm -v $query
-    fi
-}
-
-
-blacklist_pkg(){
-    local blacklist=('libsystemd') \
-    cmd=$(pacman -Q ${blacklist[@]} -r $1/root 2> /dev/null)
-    
-    if [[ -n $cmd ]] ; then
-	chroot-run $1/root pacman -Rdd "${blacklist[@]}" --noconfirm
-    fi
-}
-
-chroot_clean(){
-    for copy in "$1"/*; do
-	[[ -d ${copy} ]] || continue
-	msg2 "Deleting chroot copy '$(basename "${copy}")'..."
-
-	lock 9 "${copy}.lock" "Locking chroot copy '${copy}'"
-
-	if [[ "$(stat -f -c %T "${copy}")" == btrfs ]]; then
-	    { type -P btrfs && btrfs subvolume delete "${copy}"; } &>/dev/null
-	fi
-	rm -rf --one-file-system "${copy}"
-    done
-    exec 9>&-
-    
-    rm -rf --one-file-system "$1"
-}
+# clean_up(){
+#     msg "Cleaning up ..."
+#     
+#     local query=$(find ${pkg_dir} -maxdepth 1 -name "*.*")
+#     
+#     [[ -n $query ]] && rm -v $query
+#     
+#     if [[ -z $LOGDEST ]];then
+# 	query=$(find $PWD -maxdepth 2 -name '*.log')
+# 	[[ -n $query ]] && rm -v $query
+#     fi
+#     
+#     if [[ -z $SRCDEST ]];then
+# 	query=$(find $PWD -maxdepth 2 -name '*.?z?')
+# 	[[ -n $query ]] && rm -v $query
+#     fi
+# }
+# 
+# blacklist_pkg(){
+#     local blacklist=('libsystemd') \
+#     cmd=$(pacman -Q ${blacklist[@]} -r $1/root 2> /dev/null)
+#     
+#     if [[ -n $cmd ]] ; then
+# 	chroot-run $1/root pacman -Rdd "${blacklist[@]}" --noconfirm
+#     fi
+# }
+# 
+# chroot_clean(){
+#     for copy in "$1"/*; do
+# 	[[ -d ${copy} ]] || continue
+# 	msg2 "Deleting chroot copy '$(basename "${copy}")'..."
+# 
+# 	lock 9 "${copy}.lock" "Locking chroot copy '${copy}'"
+# 
+# 	if [[ "$(stat -f -c %T "${copy}")" == btrfs ]]; then
+# 	    { type -P btrfs && btrfs subvolume delete "${copy}"; } &>/dev/null
+# 	fi
+# 	rm -rf --one-file-system "${copy}"
+#     done
+#     exec 9>&-
+#     
+#     rm -rf --one-file-system "$1"
+# }

lib/util.sh

@@ -150,14 +150,14 @@ check_root() {
 }
 
 load_vars() {
-    local mpkg_conf="$1" var
-
-    [[ -f $mpkg_conf ]] || return 1
+    local var
+    
+    [[ -f $1 ]] || return 1
 
     for var in {SRC,SRCPKG,PKG,LOG}DEST MAKEFLAGS PACKAGER CARCH GPGKEY; do
-	    [[ -z ${!var} ]] && eval $(grep "^${var}=" "$mpkg_conf")
+	    [[ -z ${!var} ]] && eval $(grep "^${var}=" "$1")
     done
-
+    
     return 0
 }
 
@@ -198,8 +198,8 @@ load_config(){
 }
 
 load_sets(){
-    local prof= temp=
-    for item in $(ls ${profiledir}/*.set);do
+    local prof temp
+    for item in $(ls ${profiledir}/*.set); do
 	temp=${item##*/}
 	prof=${prof:-}${prof:+|}${temp%.set}
     done