Martchus
/
devtools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make default copydir user-dependent 

Eases usage when chroots are shared between multiple users.
This commit is contained in:
Jan Steffens 2011-03-13 19:07:04 +01:00
parent 0af05a48ab
commit 2fa8fdec47
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
makechrootpkg
View File

@ -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}"