setup-all-dchroots: move DPKGARCH to where it's used

[mirror/dsa-puppet.git] / modules / schroot / files / setup-all-dchroots

diff --git a/modules/schroot/files/setup-all-dchroots b/modules/schroot/files/setup-all-dchroots
index 1031b5e..7ff84b4 100755 (executable)
--- a/modules/schroot/files/setup-all-dchroots
+++ b/modules/schroot/files/setup-all-dchroots
@@ -28,9 +28,6 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
 
-DPKGARCH=$(dpkg --print-architecture)
-UNAMEARCH=$(uname -m)
-
 get_suites() {
     case "$1" in
       amd64|i386|armel|armhf)
@@ -49,13 +46,13 @@ do_one() {
     case "$MODE" in
         buildd)
             mkdir -p /srv/buildd/unpack
-            if ! $SILENT setup-dchroot $extraargs -f -a "$a" $extra -D -d '/srv/buildd/unpack' -K "$s"
+            if ! $SILENT setup-dchroot $EXTRAARGS -f -a "$a" -D -d '/srv/buildd/unpack' -K "$s"
             then
                 return 1
             fi
             ;;
         porterbox)
-            if ! $SILENT setup-dchroot $extraargs -f -a "$a" $extra "$s"
+            if ! $SILENT setup-dchroot $EXTRAARGS -f -a "$a" "$s"
             then
                 return 1
             fi
@@ -78,12 +75,19 @@ OPTIONS:
 EOF
 }
 
-extraargs=""
+##########
+# "main"
+##########
+
+
+# parse options
+##########
+EXTRAARGS=""
 while getopts "cu" OPTION
 do
     case $OPTION in
         c)
-            extraargs="$extraargs -c"
+            EXTRAARGS="$EXTRAARGS -c"
             ;;
         h)
             usage
@@ -97,6 +101,8 @@ do
 done
 shift $(($OPTIND - 1))
 
+# parse arguments
+##########
 if [ "$#" -gt 1 ]; then
     usage >&2
     exit 1
@@ -115,16 +121,18 @@ else
     MODE=porterbox
 fi
 
+# figure out whether to be verbose or not
+##########
 if [ -t 0 ] ; then
     SILENT=""
 else
     SILENT="chronic"
 fi
 
-
-extra=""
-
-archs="$DPKGARCH"
+# get list of archs based on dpkg architecture
+##########
+DPKGARCH=$(dpkg --print-architecture)
+archs="DPKGARCH"
 case "$DPKGARCH" in
     amd64)
         archs="$archs i386"