From 0a630629b1bda68d39c256e5d9304983fc4eb4ce Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@parabola.nu>
Date: Mon, 10 Apr 2017 13:25:26 -0400
Subject: makechrootpkg: sync_chroot: make usage easier to understand.

Also, shorten the "Synchronizing" message to only include the full path
to the copy if it was specified.

The capslocked variable names in the Usage comment were references to
things in Parabola's tools, that didn't make much sense here out of
context.
---
 makechrootpkg.in | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'makechrootpkg.in')

diff --git a/makechrootpkg.in b/makechrootpkg.in
index 88c2cdc..d92d6ab 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -98,16 +98,11 @@ load_vars() {
 	return 0
 }
 
-# Usage: sync_chroot $CHROOTDIR/$CHROOT <$CHROOTCOPY|$copydir>
+# Usage: sync_chroot $chrootdir $copydir [$copy]
 sync_chroot() {
 	local chrootdir=$1
-	local copy=$2
-	local copydir=''
-	if [[ ${copy:0:1} = / ]]; then
-		copydir=$copy
-	else
-		copydir="$chrootdir/$copy"
-	fi
+	local copydir=$2
+	local copy=${3:-$2}
 
 	if [[ "$chrootdir/root" -ef "$copydir" ]]; then
 		error 'Cannot sync copy with itself: %s' "$copydir"
@@ -119,7 +114,7 @@ sync_chroot() {
 	slock 8 "$chrootdir/root.lock" \
 		"Locking clean chroot [%s]" "$chrootdir/root"
 
-	stat_busy "Synchronizing chroot copy [%s] -> [%s]" "$chrootdir/root" "$copydir"
+	stat_busy "Synchronizing chroot copy [%s] -> [%s]" "$chrootdir/root" "$copy"
 	if is_btrfs "$chrootdir" && ! mountpoint -q "$copydir"; then
 		subvolume_delete_recursive "$copydir" ||
 			die "Unable to delete subvolume %s" "$copydir"
@@ -379,7 +374,7 @@ main() {
 	lock 9 "$copydir.lock" "Locking chroot copy [%s]" "$copy"
 
 	if [[ ! -d $copydir ]] || $clean_first; then
-		sync_chroot "$chrootdir" "$copy"
+		sync_chroot "$chrootdir" "$copydir" "$copy"
 	fi
 
 	$update_first && arch-nspawn "$copydir" \
-- 
cgit v1.2.3-54-g00ecf