diff options
| -rw-r--r-- | examples/B90lintian | 4 | ||||
| -rw-r--r-- | examples/B90list-missing | 2 | ||||
| -rw-r--r-- | examples/B91debc | 2 | ||||
| -rw-r--r-- | examples/B91dpkg-i | 10 | ||||
| -rw-r--r-- | examples/B92test-pkg | 10 | ||||
| -rw-r--r-- | examples/C10shell | 2 | ||||
| -rwxr-xr-x | examples/C11screen | 2 |
7 files changed, 16 insertions, 16 deletions
diff --git a/examples/B90lintian b/examples/B90lintian index 888e323..f6aa563 100644 --- a/examples/B90lintian +++ b/examples/B90lintian @@ -10,9 +10,9 @@ install_packages lintian echo "+++ lintian output +++" -su -c "lintian -I --show-overrides /tmp/buildd/*.changes" - pbuilder +su -c "lintian -I --show-overrides "$BUILDDIR"/*.changes" - pbuilder # use this version if you don't want lintian to fail the build -#su -c "lintian -I --show-overrides /tmp/buildd/*.changes; :" - pbuilder +#su -c "lintian -I --show-overrides "$BUILDDIR"/*.changes; :" - pbuilder echo "+++ end of lintian output +++" diff --git a/examples/B90list-missing b/examples/B90list-missing index 324cd7f..72e0286 100644 --- a/examples/B90list-missing +++ b/examples/B90list-missing @@ -6,7 +6,7 @@ # Depends on CDBS module in debian/rules: # include /usr/share/cdbs/1/rules/utils.mk echo "I: checking for missing files." -cd /tmp/buildd/*/debian +cd "$BUILDDIR"/*/debian cd .. fakeroot debian/rules list-missing #EOF diff --git a/examples/B91debc b/examples/B91debc index 98c6a47..61690c9 100644 --- a/examples/B91debc +++ b/examples/B91debc @@ -4,7 +4,7 @@ # 343894: a script to run debc command, contributed from q-funk. apt-get install -y "${APTGETOPT[@]}" devscripts -cd /tmp/buildd/*/debian +cd "$BUILDDIR"/*/debian cd .. debc #EOF diff --git a/examples/B91dpkg-i b/examples/B91dpkg-i index 00f2561..55bd7c5 100644 --- a/examples/B91dpkg-i +++ b/examples/B91dpkg-i @@ -7,22 +7,22 @@ echo "Trying to install resulting packages and test upgrades" set -ex -PKGNAMES=$(cd /tmp/buildd && ls -1 *.deb | sed 's/_.*$//' ) +PKGNAMES=$(cd "$BUILDDIR" && ls -1 *.deb | sed 's/_.*$//' ) # install-remove check -dpkg -i /tmp/buildd/*.deb +dpkg -i "$BUILDDIR"/*.deb dpkg --remove $PKGNAMES # install-purge check -dpkg -i /tmp/buildd/*.deb +dpkg -i "$BUILDDIR"/*.deb dpkg --purge $PKGNAMES # upgrade-remove check apt-get install -y "${APTGETOPT[@]}" $PKGNAMES || true -dpkg -i /tmp/buildd/*.deb +dpkg -i "$BUILDDIR"/*.deb dpkg --remove $PKGNAMES # upgrade-purge check apt-get install -y "${APTGETOPT[@]}" $PKGNAMES || true -dpkg -i /tmp/buildd/*.deb +dpkg -i "$BUILDDIR"/*.deb dpkg --purge $PKGNAMES diff --git a/examples/B92test-pkg b/examples/B92test-pkg index 1c38188..31e4aba 100644 --- a/examples/B92test-pkg +++ b/examples/B92test-pkg @@ -8,16 +8,16 @@ set -e echo "Installing the prerequisites" -for PKG in $(ls /tmp/buildd/*.deb | sed -e's,.*/,,;s,_.*,,' ); do +for PKG in $(ls "$BUILDDIR"/*.deb | sed -e's,.*/,,;s,_.*,,' ); do apt-get install -y --force-yes "$PKG" || true apt-get remove -y "$PKG" || true done # ignore the failures since they are not the prime interest -dpkg -i /tmp/buildd/*.deb || true +dpkg -i "$BUILDDIR"/*.deb || true apt-get install -y -f --force-yes -if chmod a+x /tmp/buildd/*/debian/pbuilder-test/*; then +if chmod a+x "$BUILDDIR"/*/debian/pbuilder-test/*; then : else echo "W: no pbuilder-test script found, skipping" @@ -30,9 +30,9 @@ unset FAIL || true EXIT_CODE=0 # The current directory is the top of the source-tree. -cd /tmp/buildd/*/debian/.. +cd "$BUILDDIR"/*/debian/.. -for SCRIPT in $(run-parts --test /tmp/buildd/*/debian/pbuilder-test) ; do +for SCRIPT in $(run-parts --test "$BUILDDIR"/*/debian/pbuilder-test) ; do echo "--- BEGIN test: ${SCRIPT##*/}" if "${SCRIPT}"; then echo SUCCESS diff --git a/examples/C10shell b/examples/C10shell index 017cb0e..e547094 100644 --- a/examples/C10shell +++ b/examples/C10shell @@ -3,5 +3,5 @@ # # invoke shell if build fails. apt-get install -y "${APTGETOPT[@]}" vim less -cd /tmp/buildd/*/debian/.. +cd "$BUILDDIR"/*/debian/.. /bin/bash < /dev/tty > /dev/tty 2> /dev/tty diff --git a/examples/C11screen b/examples/C11screen index 9b1d30f..c26b2e2 100755 --- a/examples/C11screen +++ b/examples/C11screen @@ -5,5 +5,5 @@ export debian_chroot="pbuilder" apt-get install -y "${APTGETOPT[@]}" screen vim less -cd /tmp/buildd/*/debian/.. +cd "$BUILDDIR/*/debian/.." screen </dev/tty > /dev/tty 2> /dev/tty |