From 2d318969f4ff92f5361004419053fd09f46ed39b Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Wed, 30 Aug 2006 16:31:07 +0000
Subject: Standardized pbuilderopts support.

---
 localcowbuilder-login | 6 ++++--
 localcowdebuild       | 7 +------
 localpbuilder-login   | 7 +++++--
 localpdebuild         | 7 +------
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/localcowbuilder-login b/localcowbuilder-login
index f0b3650..29a9a17 100755
--- a/localcowbuilder-login
+++ b/localcowbuilder-login
@@ -1,13 +1,14 @@
 #!/bin/sh
 
 if [ $# -eq 0 ]; then
-	echo "Usage:   $(basename $0) POOL"
+	echo "Usage:   $(basename $0) POOL [cowbuilderopts]"
 	echo ""
 	echo "Example: $(basename $0) sarge_with_hacks"
 	exit 1
 fi
 
 pool=$1
+shift
 
 basepath="/var/cache/pbuilder/cow-$pool"
 buildplace="/var/cache/pbuilder/build-$pool/$$"
@@ -16,4 +17,5 @@ aptcache="/var/cache/pbuilder/aptcache-$pool/"
 sudo cowbuilder --login \
 	--basepath "$basepath" \
 	--buildplace "$buildplace" \
-	--aptcache "$aptcache"
+	--aptcache "$aptcache" \
+	$@
diff --git a/localcowdebuild b/localcowdebuild
index fcfc2b6..d4f7934 100755
--- a/localcowdebuild
+++ b/localcowdebuild
@@ -14,7 +14,6 @@ if [ $# -eq 0 ]; then
 fi
 
 pools=''
-pbuilderopts=''
 pdebuildopts=''
 debbuildopts=''
 while [ $# -gt 0 ]; do
@@ -42,7 +41,6 @@ while [ $# -gt 0 ]; do
 			;;
 	esac
 done
-pbuilderopts="$pbuilderopts $@"
 
 for pool in $pools; do
 	basepath="/var/cache/pbuilder/cow-$pool"
@@ -59,8 +57,5 @@ for pool in $pools; do
 	--buildplace "$buildplace" \
 	--aptcache "$aptcache" \
 	--pkgname-logfile \
-	$pbuilderopts
-
-#	$pbuilderopts \
-#	| tee $HOME/src/pbuild-$pool/buildlog.$$
+	$@
 done
diff --git a/localpbuilder-login b/localpbuilder-login
index a608e88..a41f368 100755
--- a/localpbuilder-login
+++ b/localpbuilder-login
@@ -1,13 +1,14 @@
 #!/bin/sh
 
 if [ $# -eq 0 ]; then
-	echo "Usage:   $(basename $0) POOL"
+	echo "Usage:   $(basename $0) POOL [pbuilderopts]"
 	echo ""
 	echo "Example: $(basename $0) sarge_with_hacks"
 	exit 1
 fi
 
 pool=$1
+shift
 
 basetgz="/var/cache/pbuilder/base-$pool.tgz"
 buildplace="/var/cache/pbuilder/build-$pool/"
@@ -16,4 +17,6 @@ aptcache="/var/cache/pbuilder/aptcache-$pool/"
 sudo pbuilder --login \
 	--basetgz "$basetgz" \
 	--buildplace "$buildplace" \
-	--aptcache "$aptcache"
+	--aptcache "$aptcache" \
+	$@
+
diff --git a/localpdebuild b/localpdebuild
index 763ecd6..733cbb4 100755
--- a/localpdebuild
+++ b/localpdebuild
@@ -14,7 +14,6 @@ if [ $# -eq 0 ]; then
 fi
 
 pools=''
-pbuilderopts=''
 pdebuildopts=''
 debbuildopts=''
 while [ $# -gt 0 ]; do
@@ -42,7 +41,6 @@ while [ $# -gt 0 ]; do
 			;;
 	esac
 done
-pbuilderopts="$pbuilderopts $@"
 
 for pool in $pools; do
 	pdebuild \
@@ -54,8 +52,5 @@ for pool in $pools; do
 	--buildplace /var/cache/pbuilder/build-$pool/ \
 	--aptcache /var/cache/pbuilder/aptcache-$pool/ \
 	--pkgname-logfile \
-	$pbuilderopts
-
-#	$pbuilderopts \
-#	| tee $HOME/src/pbuild-$pool/buildlog.$$
+	$@
 done
-- 
cgit v1.2.3