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

makechrootpkg: Bashify syntax 

No functional change. Eliminates unused variables RUN and FORCE.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
Jan Alexander Steffens (heftig) 2011-09-17 14:46:10 +02:00 committed by Lukas Fleischer
parent 21daec135a
commit 733668f4cc
1 changed files with 111 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

224
makechrootpkg.in
View File

@ -8,27 +8,22 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
FORCE='n' workdir="$PWD"
RUN='' makepkg_args='-s --noconfirm'
MAKEPKG_ARGS='-s --noconfirm' repack=false
REPACK='' update_first=false
WORKDIR=$PWD clean_first=false
install_pkg=
update_first='0' add_to_db=false
clean_first='0' chrootdir=
install_pkg='' appname=${0##*/}
add_to_db=0
chrootdir=''
APPNAME=$(basename "${0}")
default_copy=$USER default_copy=$USER
[[ -n $SUDO_USER ]] && default_copy=$SUDO_USER [[ -n $SUDO_USER ]] && default_copy=$SUDO_USER
[[ -z $default_copy || $default_copy = root ]] && default_copy=copy [[ -z $default_copy || $default_copy = root ]] && default_copy=copy
usage() { usage() {
echo "usage ${APPNAME} [options] -r <chrootdir> [--] [makepkg args]" echo "usage $appname [options] -r <chrootdir> [--] [makepkg args]"
echo ' Run this script in a PKGBUILD dir to build a package inside a' echo ' Run this script in a PKGBUILD dir to build a package inside a'
echo ' clean chroot. All unrecognized arguments passed to this script' echo ' clean chroot. All unrecognized arguments passed to this script'
echo ' will be passed to makepkg.' echo ' will be passed to makepkg.'
@ -41,7 +36,7 @@ usage() {
echo 'command:' echo 'command:'
echo ' mkarchroot <chrootdir>/root base base-devel sudo' echo ' mkarchroot <chrootdir>/root base base-devel sudo'
echo '' echo ''
echo "Default makepkg args: $MAKEPKG_ARGS" echo "Default makepkg args: $makepkg_args"
echo '' echo ''
echo 'Flags:' echo 'Flags:'
echo '-h This help' echo '-h This help'
@ -59,22 +54,22 @@ usage() {
} }
while getopts 'hcudr:I:l:' arg; do while getopts 'hcudr:I:l:' arg; do
case "${arg}" in case "$arg" in
h) usage ;; h) usage ;;
c) clean_first=1 ;; c) clean_first=true ;;
u) update_first=1 ;; u) update_first=true ;;
d) add_to_db=1 ;; d) add_to_db=true ;;
r) chrootdir="$OPTARG" ;; r) chrootdir="$OPTARG" ;;
I) install_pkg="$OPTARG" ;; I) install_pkg="$OPTARG" ;;
l) copy="$OPTARG" ;; l) copy="$OPTARG" ;;
*) MAKEPKG_ARGS="$MAKEPKG_ARGS -$arg $OPTARG" ;; *) makepkg_args="$makepkg_args -$arg $OPTARG" ;;
esac esac
done done
# Canonicalize chrootdir, getting rid of trailing / # Canonicalize chrootdir, getting rid of trailing /
chrootdir=$(readlink -e "$chrootdir") chrootdir=$(readlink -e "$chrootdir")
if [[ ${copy:0:1} = "/" ]]; then if [[ ${copy:0:1} = / ]]; then
copydir=$copy copydir=$copy
else else
[[ -z $copy ]] && copy=$default_copy [[ -z $copy ]] && copy=$default_copy
@ -82,32 +77,32 @@ else
fi fi
# Pass all arguments after -- right to makepkg # Pass all arguments after -- right to makepkg
MAKEPKG_ARGS="$MAKEPKG_ARGS ${*:$OPTIND}" makepkg_args="$makepkg_args ${*:$OPTIND}"
# See if -R was passed to makepkg # See if -R was passed to makepkg
for arg in ${*:$OPTIND}; do for arg in ${*:$OPTIND}; do
if [ "$arg" = '-R' ]; then if [[ $arg = -R ]]; then
REPACK=1 repack=1
break; break
fi fi
done done
if [ "$EUID" != '0' ]; then if (( EUID )); then
echo 'This script must be run as root.' echo 'This script must be run as root.'
exit 1 exit 1
fi fi
if [ ! -f PKGBUILD -a -z "$install_pkg" ]; then if [[ ! -f PKGBUILD && -z $install_pkg ]]; then
echo 'This must be run in a directory containing a PKGBUILD.' echo 'This must be run in a directory containing a PKGBUILD.'
exit 1 exit 1
fi fi
if [ ! -d "$chrootdir" ]; then if [[ ! -d $chrootdir ]]; then
echo "No chroot dir defined, or invalid path '$chrootdir'" echo "No chroot dir defined, or invalid path '$chrootdir'"
exit 1 exit 1
fi fi
if [ ! -d "$chrootdir/root" ]; then if [[ ! -d $chrootdir/root ]]; then
echo 'Missing chroot dir root directory.' echo 'Missing chroot dir root directory.'
echo "Try using: mkarchroot $chrootdir/root base base-devel sudo" echo "Try using: mkarchroot $chrootdir/root base base-devel sudo"
usage usage
@ -124,7 +119,7 @@ if ! flock -n 9; then
echo "done" echo "done"
fi fi
if [ ! -d "$copydir" -o "$clean_first" -eq "1" ]; then if [[ ! -d $copydir ]] || $clean_first; then
# Get a read lock on the root chroot to make # Get a read lock on the root chroot to make
# sure we don't clone a half-updated chroot # sure we don't clone a half-updated chroot
exec 8>"$chrootdir/root.lock" exec 8>"$chrootdir/root.lock"
@ -138,8 +133,9 @@ if [ ! -d "$copydir" -o "$clean_first" -eq "1" ]; then
echo -n 'creating clean working copy...' echo -n 'creating clean working copy...'
use_rsync=false use_rsync=false
if type -P btrfs >/dev/null; then if type -P btrfs >/dev/null; then
[ -d $copydir ] && btrfs subvolume delete "$copydir" &>/dev/null [[ -d $copydir ]] && btrfs subvolume delete "$copydir" &>/dev/null
btrfs subvolume snapshot "$chrootdir/root" "$copydir" &>/dev/null || use_rsync=true btrfs subvolume snapshot "$chrootdir/root" "$copydir" &>/dev/null ||
use_rsync=true
else else
use_rsync=true use_rsync=true
fi fi
@ -154,152 +150,154 @@ if [ ! -d "$copydir" -o "$clean_first" -eq "1" ]; then
exec 8>&- exec 8>&-
fi fi
if [ -n "$install_pkg" ]; then if [[ -n $install_pkg ]]; then
pkgname="$(basename "$install_pkg")" pkgname="${install_pkg##*/}"
cp "$install_pkg" "$copydir/$pkgname" cp "$install_pkg" "$copydir/$pkgname"
mkarchroot -r "pacman -U /$pkgname --noconfirm" "$copydir" mkarchroot -r "pacman -U /$pkgname --noconfirm" "$copydir"
ret=$? ret=$?
rm "$copydir/$pkgname" rm "$copydir/$pkgname"
# Exit early, we've done all we need to # Exit early, we've done all we need to
exit $ret exit $ret
fi fi
if [ $update_first -eq 1 ]; then $update_first && mkarchroot -u "$copydir"
mkarchroot -u "$copydir"
fi
[ -d "$copydir/build" ] || mkdir "$copydir/build" mkdir -p "$copydir/build"
if [ "$REPACK" != "1" ]; then # Remove anything in there UNLESS -R (repack) was passed to makepkg
# Remove anything in there UNLESS -R (repack) was passed to makepkg $repack || rm -rf "$copydir"/build/*
rm -rf "$copydir/build/"*
fi
# Read .makepkg.conf even if called via sudo # Read .makepkg.conf even if called via sudo
if [ -n "${SUDO_USER}" ]; then if [[ -n $SUDO_USER ]]; then
makepkg_conf="/$(eval echo ~${SUDO_USER})/.makepkg.conf" makepkg_conf="$(eval echo ~$SUDO_USER)/.makepkg.conf"
else else
makepkg_conf="~/.makepkg.conf" makepkg_conf="$HOME/.makepkg.conf"
fi fi
# Get SRC/PKGDEST from makepkg.conf # Get SRC/PKGDEST from makepkg.conf
if [ -f "${makepkg_conf}" ]; then if [[ -f $makepkg_conf ]]; then
eval $(grep '^SRCDEST=' "${makepkg_conf}") eval $(grep '^SRCDEST=' "$makepkg_conf")
eval $(grep '^PKGDEST=' "${makepkg_conf}") eval $(grep '^PKGDEST=' "$makepkg_conf")
eval $(grep '^MAKEFLAGS=' "$makepkg_conf")
eval $(grep '^MAKEFLAGS=' "${makepkg_conf}") eval $(grep '^PACKAGER=' "$makepkg_conf")
eval $(grep '^PACKAGER=' "${makepkg_conf}")
fi fi
[ -z "${SRCDEST}" ] && eval $(grep '^SRCDEST=' /etc/makepkg.conf)
[ -z "${PKGDEST}" ] && eval $(grep '^PKGDEST=' /etc/makepkg.conf)
[ -d "$copydir/pkgdest" ] || mkdir "$copydir/pkgdest" [[ -z $SRCDEST ]] && eval $(grep '^SRCDEST=' /etc/makepkg.conf)
if ! grep 'PKGDEST="/pkgdest"' "$copydir/etc/makepkg.conf" >/dev/null 2>&1; then [[ -z $PKGDEST ]] && eval $(grep '^PKGDEST=' /etc/makepkg.conf)
[[ -z $MAKEFLAGS ]] && eval $(grep '^MAKEFLAGS=' /etc/makepkg.conf)
[[ -z $PACKAGER ]] && eval $(grep '^PACKAGER=' /etc/makepkg.conf)
mkdir -p "$copydir/pkgdest"
if ! grep -q 'PKGDEST="/pkgdest"' "$copydir/etc/makepkg.conf"; then
echo 'PKGDEST="/pkgdest"' >> "$copydir/etc/makepkg.conf" echo 'PKGDEST="/pkgdest"' >> "$copydir/etc/makepkg.conf"
fi fi
[ -d "$copydir/srcdest" ] || mkdir "$copydir/srcdest" mkdir -p "$copydir/srcdest"
if ! grep 'SRCDEST="/srcdest"' "$copydir/etc/makepkg.conf" >/dev/null 2>&1; then if ! grep -q 'SRCDEST="/srcdest"' "$copydir/etc/makepkg.conf"; then
echo 'SRCDEST="/srcdest"' >> "$copydir/etc/makepkg.conf" echo 'SRCDEST="/srcdest"' >> "$copydir/etc/makepkg.conf"
fi fi
[ -z "${MAKEFLAGS}" ] && eval $(grep '^MAKEFLAGS=' /etc/makepkg.conf)
if [ -n "${MAKEFLAGS}" ]; then if [[ -n $MAKEFLAGS ]]; then
sed -i '/^MAKEFLAGS=/d' "$copydir/etc/makepkg.conf" sed -i '/^MAKEFLAGS=/d' "$copydir/etc/makepkg.conf"
echo "MAKEFLAGS='${MAKEFLAGS}'" >> "$copydir/etc/makepkg.conf" echo "MAKEFLAGS='${MAKEFLAGS}'" >> "$copydir/etc/makepkg.conf"
fi fi
[ -z "${PACKAGER}" ] && eval $(grep '^PACKAGER=' /etc/makepkg.conf)
if [ -n "${PACKAGER}" ]; then if [[ -n $PACKAGER ]]; then
sed -i '/^PACKAGER=/d' "$copydir/etc/makepkg.conf" sed -i '/^PACKAGER=/d' "$copydir/etc/makepkg.conf"
echo "PACKAGER='${PACKAGER}'" >> "$copydir/etc/makepkg.conf" echo "PACKAGER='${PACKAGER}'" >> "$copydir/etc/makepkg.conf"
fi fi
# Set target CARCH as it might be used within the PKGBUILD to select correct sources # Set target CARCH as it might be used within the PKGBUILD to select correct sources
eval $(grep '^CARCH=' "$copydir/etc/makepkg.conf") eval $(grep '^CARCH=' "$copydir/etc/makepkg.conf")
export CARCH export CARCH
# Copy PKGBUILD and sources # Copy PKGBUILD and sources
source=($(. PKGBUILD; echo ${source[@]})) source=( $(source PKGBUILD; echo ${source[@]}) )
cp PKGBUILD "$copydir/build/" cp PKGBUILD "$copydir/build/"
for f in ${source[@]}; do for file in "${source[@]}"; do
basef=$(echo $f | sed 's|::.*||' | sed 's|^.*://.*/||g') file="${file%%::*}"
if [ -f "$basef" ]; then file="${file##*://*/}"
cp "$basef" "$copydir/srcdest/" if [[ -f $file ]]; then
elif [ -f "$SRCDEST/$basef" ]; then cp "$file" "$copydir/srcdest/"
cp "$SRCDEST/$basef" "$copydir/srcdest/" elif [[ -f $SRCDEST/$file ]]; then
cp "$SRCDEST/$file" "$copydir/srcdest/"
fi fi
done done
( . PKGBUILD (
for i in 'changelog' 'install'; do source PKGBUILD
filelist=$(sed -n "s/^[[:space:]]*$i=//p" PKGBUILD) for i in changelog install; do
for file in $filelist; do sed -n "s/^[[:space:]]*$i=//p" PKGBUILD | while IFS= read -r file; do
# evaluate any bash variables used # evaluate any bash variables used
eval file=${file} eval file="$file"
if [[ -f "$file" ]]; then [[ -f $file ]] && cp "$file" "$copydir/build/"
cp "$file" "$copydir/build/" done
fi
done done
done
) )
chown -R nobody "$copydir/build" chown -R nobody "$copydir"/{build,pkgdest,srcdest}
chown -R nobody "$copydir/srcdest"
chown -R nobody "$copydir/pkgdest"
echo 'nobody ALL = NOPASSWD: /usr/bin/pacman' > "$copydir/etc/sudoers.d/nobody-pacman" echo 'nobody ALL = NOPASSWD: /usr/bin/pacman' > "$copydir/etc/sudoers.d/nobody-pacman"
chmod 440 "$copydir/etc/sudoers.d/nobody-pacman" chmod 440 "$copydir/etc/sudoers.d/nobody-pacman"
#This is a little gross, but this way the script is recreated every time in the # This is a little gross, but this way the script is recreated every time in the
#working copy # working copy
(cat <<EOF cat >"$copydir/chrootbuild" <<EOF
#!/bin/bash #!/bin/bash
export LANG=C export LANG=C
cd /build
export HOME=/build export HOME=/build
sudo -u nobody makepkg $MAKEPKG_ARGS || touch BUILD_FAILED
[ -f BUILD_FAILED ] && exit 1 cd /build
sudo -u nobody makepkg $makepkg_args || touch BUILD_FAILED
[[ -f BUILD_FAILED ]] && exit 1
which namcap &>/dev/null && namcap /build/PKGBUILD /pkgdest/*.pkg.tar.* > /build/namcap.log which namcap &>/dev/null && namcap /build/PKGBUILD /pkgdest/*.pkg.tar.* > /build/namcap.log
exit 0 exit 0
EOF EOF
) > "$copydir/chrootbuild"
chmod +x "$copydir/chrootbuild" chmod +x "$copydir/chrootbuild"
if mkarchroot -r "/chrootbuild" "$copydir"; then if mkarchroot -r "/chrootbuild" "$copydir"; then
for pkgfile in "${copydir}"/pkgdest/*.pkg.tar.*; do for pkgfile in "$copydir"/pkgdest/*.pkg.tar.*; do
[ -e "$pkgfile" ] || continue [[ -e $pkgfile ]] || continue
if [ "$add_to_db" -eq "1" ]; then if $add_to_db; then
mkdir -p "${copydir}/repo" mkdir -p "$copydir/repo"
pushd "${copydir}/repo" >/dev/null pushd "$copydir/repo" >/dev/null
cp "$pkgfile" . cp "$pkgfile" .
repo-add repo.db.tar.gz "$(basename "$pkgfile")" repo-add repo.db.tar.gz "${pkgfile##*/}"
popd >/dev/null popd >/dev/null
fi fi
if [ -d "$PKGDEST" ]; then if [[ -d $PKGDEST ]]; then
mv "$pkgfile" "${PKGDEST}" mv "$pkgfile" "$PKGDEST"
else else
mv "$pkgfile" "${WORKDIR}" mv "$pkgfile" "$workdir"
fi fi
done done
for l in "${copydir}"/build/{namcap,*-{build,check,package,package_*}}.log; do for l in "$copydir"/build/{namcap,*-{build,check,package,package_*}}.log; do
[ -f "$l" ] && mv "$l" "${WORKDIR}" [[ -f $l ]] && mv "$l" "$workdir"
done done
else else
#just in case. We returned 1, make sure we fail # Just in case. We returned 1, make sure we fail
touch "${copydir}/build/BUILD_FAILED" touch "$copydir/build/BUILD_FAILED"
fi fi
for f in "${copydir}"/srcdest/*; do for f in "$copydir"/srcdest/*; do
[ -e "$f" ] || continue [[ -e $f ]] || continue
if [ -d "$SRCDEST" ]; then if [[ -d $SRCDEST ]]; then
mv "$f" "${SRCDEST}" mv "$f" "$SRCDEST"
else else
mv "$f" "${WORKDIR}" mv "$f" "$workdir"
fi fi
done done
if [ -e "${copydir}/build/BUILD_FAILED" ]; then if [[ -e $copydir/build/BUILD_FAILED ]]; then
echo "Build failed, check $copydir/build" echo "Build failed, check $copydir/build"
rm "${copydir}/build/BUILD_FAILED" rm "$copydir/build/BUILD_FAILED"
exit 1 exit 1
fi fi