From 2fa8fdec478529cd8649d38f9bfe2e50a3e28469 Mon Sep 17 00:00:00 2001
From: Jan Steffens <jan.steffens@gmail.com>
Date: Sun, 13 Mar 2011 19:07:04 +0100
Subject: Make default copydir user-dependent
Eases usage when chroots are shared between multiple users.
---
makechrootpkg | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/makechrootpkg b/makechrootpkg
index 5bf492f..2a9f56b 100755
--- a/makechrootpkg
+++ b/makechrootpkg
@@ -12,7 +12,6 @@ FORCE='n'
RUN=''
MAKEPKG_ARGS='-s --noconfirm'
REPACK=''
-COPY='copy'
WORKDIR=$PWD
update_first='0'
@@ -24,6 +23,10 @@ chrootdir=''
APPNAME=$(basename "${0}")
+default_copy=$USER
+[[ -n $SUDO_USER ]] && default_copy=$SUDO_USER
+[[ -z $default_copy || $default_copy = root ]] && default_copy=copy
+
usage() {
echo "usage ${APPNAME} [options] -r <chrootdir> [--] [makepkg args]"
echo ' Run this script in a PKGBUILD dir to build a package inside a'
@@ -50,7 +53,8 @@ usage() {
echo '-r <dir> The chroot dir to use'
echo '-I <pkg> Install a package into the working copy of the chroot'
echo '-l <copy> The directory to use as the working copy of the chroot'
- echo ' Useful for maintain multiple copies Default: copy'
+ echo ' Useful for maintaining multiple copies.'
+ echo " Default: $default_copy"
exit 1
}
@@ -62,7 +66,7 @@ while getopts 'hcudr:I:l:' arg; do
d) add_to_db=1 ;;
r) chrootdir="$OPTARG" ;;
I) install_pkg="$OPTARG" ;;
- l) COPY="$OPTARG" ;;
+ l) copy="$OPTARG" ;;
*) MAKEPKG_ARGS="$MAKEPKG_ARGS -$arg $OPTARG" ;;
esac
done
@@ -70,7 +74,8 @@ done
# Canonicalize chrootdir, getting rid of trailing /
chrootdir=$(readlink -e "$chrootdir")
-copydir="$chrootdir/$COPY"
+[[ -z $copy ]] && copy=$default_copy
+copydir="$chrootdir/$copy"
# Pass all arguments after -- right to makepkg
MAKEPKG_ARGS="$MAKEPKG_ARGS ${*:$OPTIND}"
--
cgit v1.2.3-2-g168b