fixes

bin/build-set.in

@@ -96,6 +96,16 @@ chroot_update(){
 	      pacman -Syu --noconfirm || abort
 }
 
+move_pkg(){
+    local ext='pkg.tar.xz'
+    if [[ -n $PKGDEST ]];then
+	mv $PKGDEST/*{any,$arch}.${ext} ${pkgdir}/
+    else
+	mv *.${ext} ${pkgdir}/
+    fi
+    chown -R "${pkg_owner}:users" "${pkgdir}"
+}
+
 chroot_build(){
     if ${is_profile};then
 	msg "Start building profile: [${profile}]"
@@ -106,7 +116,7 @@ chroot_build(){
 	    fi
 	    setarch "${arch}" \
 		mkchrootpkg ${mkchrootpkg_args[*]} -- ${makepkg_args[*]} || break
-	    move_pkg "${pkg_owner}"
+	    move_pkg
 	    cd ..
 	done
 	msg "Finished building profile: [${profile}]"
@@ -117,7 +127,7 @@ chroot_build(){
 	fi
 	setarch "${arch}" \
 	    mkchrootpkg ${mkchrootpkg_args[*]} -- ${makepkg_args[*]} || abort
-	move_pkg "${pkg_owner}"
+	move_pkg
 	cd ..
     fi
 }
@@ -133,6 +143,13 @@ chroot_init(){
     fi
 }
 
+sign_pkgs(){
+    cd $pkgdir
+    su "${pkg_owner}" <<'EOF'
+signpkgs
+EOF
+}
+
 export LC_MESSAGES=C
 
 load_config '@sysconfdir@'
@@ -218,7 +235,7 @@ makepkg_args+=("${@:$OPTIND}")
 
 check_root "$0" "${orig_argv[@]}"
 
-[[ -d "${pkgdir}" ]] || prepare_dir "${pkgdir}" "${pkg_owner}"
+[[ -d "${pkgdir}" ]] || prepare_dir "${pkg_owner}"
 
 eval_profile "${profile}"
 
@@ -230,4 +247,4 @@ chroot_init
 
 chroot_build
 
-${sign} && sign_pkgs "${pkg_owner}"
+${sign} && sign_pkgs

lib/util-build.sh

@@ -9,23 +9,6 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-sign_pkgs(){
-    cd $pkgdir
-    su $1 <<'EOF'
-signpkgs
-EOF
-}
-
-move_pkg(){
-    local ext='pkg.tar.xz'
-    if [[ -n $PKGDEST ]];then
-	mv $PKGDEST/*{any,$arch}.${ext} ${pkgdir}/
-    else
-	mv *.${ext} ${pkgdir}/
-    fi
-    chown -R "$1:users" "${pkgdir}"
-}
-
 clean_up(){
     msg "Cleaning up ..."
     

lib/util.sh

@@ -207,6 +207,6 @@ load_sets(){
 }
 
 prepare_dir(){
-    mkdir -p $1
-    chown -R "$2:users" "$(dirname $1)"
+    mkdir -p "${pkgdir}"
+    chown -R "$1:users" "$(dirname ${pkgdir})"
 }