summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2014-09-23 13:57:43 +0200
committerDave Reisner <dreisner@archlinux.org>2014-10-01 01:28:47 +0200
commit285a4e94cdee62cae155abcec4daeeffd709e900 (patch)
treefd0d96a5353dd23b81f8fda7affec5ca993eaf5f
parenta78bdb841dbe7839c8afd7184d821ed42dd334cc (diff)
downloaddevtools-285a4e94cdee62cae155abcec4daeeffd709e900.tar.gz
devtools-285a4e94cdee62cae155abcec4daeeffd709e900.tar.xz
makechrootpkg: make running namcap a "compile time" choice
We don't need to pass _chrootbuild this information at runtime -- we can just generate the build script to do exactly what we want.
-rw-r--r--makechrootpkg.in28
1 files changed, 14 insertions, 14 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in
index b82c2a2..a340116 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -262,8 +262,19 @@ EOF
# This is a little gross, but this way the script is recreated every time in the
# working copy
- printf $'#!/bin/bash\n%s\n_chrootbuild %q %q' "$(declare -f _chrootbuild)" \
- "$makepkg_args" "$run_namcap" >"$copydir/chrootbuild"
+ {
+ printf $'#!/bin/bash\n%s\n_chrootbuild %q %q\n' "$(declare -f _chrootbuild)" \
+ "$makepkg_args" "$run_namcap"
+ if $run_namcap; then
+ cat <<'EOF'
+pacman -S --needed --noconfirm namcap
+for pkgfile in /startdir/PKGBUILD /pkgdest/*; do
+ echo "Checking ${pkgfile##*/}"
+ sudo -u builduser namcap "$pkgfile" 2>&1 | tee "/logdest/${pkgfile##*/}-namcap.log"
+done
+EOF
+ fi
+ } >"$copydir/chrootbuild"
chmod +x "$copydir/chrootbuild"
}
@@ -290,7 +301,6 @@ _chrootbuild() {
# This function isn't run in makechrootpkg,
# so no global variables
local makepkg_args="$1"
- local run_namcap="$2"
. /etc/profile
export HOME=/build
@@ -326,17 +336,7 @@ _chrootbuild() {
exit 1
fi
- sudo -u builduser makepkg $makepkg_args || exit 1
-
- if $run_namcap; then
- pacman -S --needed --noconfirm namcap
- for pkgfile in /startdir/PKGBUILD /pkgdest/*; do
- echo "Checking ${pkgfile##*/}"
- sudo -u builduser namcap "$pkgfile" 2>&1 | tee "/logdest/${pkgfile##*/}-namcap.log"
- done
- fi
-
- exit 0
+ sudo -u builduser makepkg $makepkg_args
}
move_products() {