diff options
| author | Luke Shumaker <lukeshu@parabola.nu> | 2017-05-05 18:40:59 -0400 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2017-07-14 06:54:28 +0200 |
| commit | 89e08408ff3e28268a992c5279713c8cf44d7eef (patch) | |
| tree | 346ea6df7092a864cc8599e2e65bce7884e6d8f6 | |
| parent | c7ac915301340118ea4cbda915d664b676ad4f2d (diff) | |
| download | devtools32-89e08408ff3e28268a992c5279713c8cf44d7eef.tar.xz | |
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.
| -rw-r--r-- | makechrootpkg.in | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in index 196cbe9..9a77441 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" @@ -380,7 +375,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" \ |