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

archbuild: Proper quoting, use double brackets 

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
This commit is contained in:
Lukas Fleischer 2011-08-28 18:36:52 +02:00 committed by Pierre Schmitz
parent d70918d18a
commit ef10f6c799
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
archbuild
View File

@ -3,7 +3,7 @@
base_packages=(base base-devel sudo) base_packages=(base base-devel sudo)
cmd="$(basename "${0%-build}")" cmd="$(basename "${0%-build}")"
if [ "${cmd%-*}" == 'multilib' ]; then if [[ "${cmd%-*}" == 'multilib' ]]; then
repo="${cmd}" repo="${cmd}"
arch='x86_64' arch='x86_64'
base_packages+=(multilib-devel) base_packages+=(multilib-devel)
@ -29,39 +29,39 @@ while getopts 'cr:' arg; do
esac esac
done done
if [ "$EUID" != '0' ]; then if [[ "$EUID" != '0' ]]; then
echo 'This script must be run as root.' echo 'This script must be run as root.'
exit 1 exit 1
fi fi
if ${clean_first} || [ ! -d "${chroots}/${repo}-${arch}" ]; then if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
echo "Creating chroot for [${repo}] (${arch})..." echo "Creating chroot for [${repo}] (${arch})..."
for copy in ${chroots}/${repo}-${arch}/*; do for copy in "${chroots}/${repo}-${arch}"/*; do
[[ -d $copy ]] || continue [[ -d $copy ]] || continue
echo "Deleting chroot copy '$(basename "${copy}")'..." echo "Deleting chroot copy '$(basename "${copy}")'..."
# Lock the copy # Lock the copy
exec 9>${copy}.lock exec 9>"${copy}.lock"
flock 9 flock 9
{ type -P btrfs && btrfs subvolume delete ${copy}; } &>/dev/null { type -P btrfs && btrfs subvolume delete "${copy}"; } &>/dev/null
rm -rf ${copy} rm -rf "${copy}"
done done
exec 9>&- exec 9>&-
rm -rf ${chroots}/${repo}-${arch} rm -rf "${chroots}/${repo}-${arch}"
mkdir -p ${chroots}/${repo}-${arch} mkdir -p "${chroots}/${repo}-${arch}"
setarch ${arch} mkarchroot \ setarch "${arch}" mkarchroot \
-C /usr/share/devtools/pacman-${repo}.conf \ -C "/usr/share/devtools/pacman-${repo}.conf" \
-M /usr/share/devtools/makepkg-${arch}.conf \ -M "/usr/share/devtools/makepkg-${arch}.conf" \
${chroots}/${repo}-${arch}/root \ "${chroots}/${repo}-${arch}/root" \
"${base_packages[@]}" "${base_packages[@]}"
else else
setarch ${arch} mkarchroot \ setarch ${arch} mkarchroot \
-u \ -u \
${chroots}/${repo}-${arch}/root "${chroots}/${repo}-${arch}/root"
fi fi
echo "Building in chroot for [${repo}] (${arch})..." echo "Building in chroot for [${repo}] (${arch})..."
setarch ${arch} makechrootpkg -c -r ${chroots}/${repo}-${arch} setarch "${arch}" makechrootpkg -c -r "${chroots}/${repo}-${arch}"