[Pkg-multidistrotools-commits] r21 - multidistrotools/trunk/scripts

[raphink-guest at alioth.debian.org]

Author: raphink-guest
Date: 2007-12-24 09:44:29 +0000 (Mon, 24 Dec 2007)
New Revision: 21

Modified:
   multidistrotools/trunk/scripts/dist-create.bash
Log:
Add option [ -a <arch> ] to specify architecture (creates apt.conf).



Modified: multidistrotools/trunk/scripts/dist-create.bash
===================================================================
--- multidistrotools/trunk/scripts/dist-create.bash	2007-12-24 09:33:03 UTC (rev 20)
+++ multidistrotools/trunk/scripts/dist-create.bash	2007-12-24 09:44:29 UTC (rev 21)
@@ -9,14 +9,14 @@
 #   - Skip debian-installer section from deb-src sources.list line
 
 usage() {
-	cat > /dev/stdout <<EOF
+	cat <<EOF
 This script create an APT tree for the given distribution under
 ~/.multidistrotools. You can think of it as a chroot, even if it is not
 the case (it is a much lighter aproach). Later, this tree can be
 used with mdt dist-apt-get and mdt-dist-apt-cache.
 
 Syntax:
-  mdt dist-create <id> <mirror, dist and sections for sources.list>
+  mdt dist-create [-a <arch>] <id> <mirror, dist and sections for sources.list>
 
 Examples:
 * Create a Debian Sid tree named 'sid' with main and contrib sections:
@@ -34,19 +34,33 @@
 	exit 1
 fi
 
-ID="$1"
-SUITE_HOME="$HOME/.multidistrotools/$ID"
-shift
+if [ "$1" == '-a' ]; then
+	ARCH=$2
+	ID=$3
+else
+	ID=$1
+fi
+
+
+SUITE_HOME=$HOME/.multidistrotools/$ID
 SETTINGS=$*
 CHROOT_DIRS="etc/apt var/lib/apt/lists/partial var/lib/dpkg var/cache/apt/archives/partial"
 
 for d in $CHROOT_DIRS; do
     mkdir -p $SUITE_HOME/$d
 done
-touch "$SUITE_HOME/var/lib/dpkg/status"
+touch $SUITE_HOME/var/lib/dpkg/status
 
+if [[ -n $ARCH ]]; then
+    cat << __EOF > $SUITE_HOME/etc/apt/apt.conf
+APT {
+   Architecture "$ARCH";
+   }
+__EOF
+fi
+
 echo "deb $SETTINGS" > $SUITE_HOME/etc/apt/sources.list
-echo "deb-src $SETTINGS" | sed 's,[a-z]*/debian-installer,,g;s,  , ,g' >> "$SUITE_HOME/etc/apt/sources.list"
+echo "deb-src $SETTINGS" | sed 's,[a-z]*/debian-installer,,g;s,  , ,g' >> $SUITE_HOME/etc/apt/sources.list
 echo "You can now edit manually the sources.list file to tweak settings."
-echo "$SUITE_HOME/etc/apt/sources.list"
+echo $SUITE_HOME/etc/apt/sources.list
 echo "Then run mdt dist-apt-get $ID update"