[Pkg-multidistrotools-commits] r5 - multidistrotools/trunk/scripts
Lucas Nussbaum
lucas-guest at alioth.debian.org
Tue Nov 28 14:47:51 CET 2006
Author: lucas-guest
Date: 2006-11-28 14:47:51 +0100 (Tue, 28 Nov 2006)
New Revision: 5
Modified:
multidistrotools/trunk/scripts/compare-versions.bash
multidistrotools/trunk/scripts/depends.bash
multidistrotools/trunk/scripts/dist-apt-cache.bash
multidistrotools/trunk/scripts/dist-apt-get.bash
multidistrotools/trunk/scripts/dist-create.bash
multidistrotools/trunk/scripts/dist-grep-dctrl-packages.bash
multidistrotools/trunk/scripts/list_diff.bash
multidistrotools/trunk/scripts/list_inter.bash
multidistrotools/trunk/scripts/list_sub.bash
multidistrotools/trunk/scripts/list_union.bash
multidistrotools/trunk/scripts/src2bin.bash
multidistrotools/trunk/scripts/unify.bash
Log:
Escaped a lot of $strings in bash scripts. Not tested at all.
Modified: multidistrotools/trunk/scripts/compare-versions.bash
===================================================================
--- multidistrotools/trunk/scripts/compare-versions.bash 2006-11-19 23:03:25 UTC (rev 4)
+++ multidistrotools/trunk/scripts/compare-versions.bash 2006-11-28 13:47:51 UTC (rev 5)
@@ -22,21 +22,21 @@
usage
exit 1
fi
-if [ ! -d $HOME/.multidistrotools/$1 ]; then
+if [ ! -d "$HOME/.multidistrotools/$1" ]; then
echo "APT tree named $1 doesn't exist in $HOME/.multidistrotools."
exit 1
fi
-DIST1=$1
-if [ ! -d $HOME/.multidistrotools/$2 ]; then
+DIST1="$1"
+if [ ! -d "$HOME/.multidistrotools/$2" ]; then
echo "APT tree named $2 doesn't exist in $HOME/.multidistrotools."
exit 1
fi
-DIST2=$2
+DIST2="$2"
MCVDIR=$(mktemp -d /tmp/MCV.XXXXXX)
-for D in $DIST1 $DIST2; do
- cat ~/.multidistrotools/${D}/var/lib/apt/lists/*_Sources | awk '/^Package:/ { p = $2 } /^Version:/ { print p, $2 }' | sort > $MCVDIR/${D}_packages
+for D in "$DIST1" "$DIST2"; do
+ cat "~/.multidistrotools/${D}/var/lib/apt/lists/*_Sources" | awk '/^Package:/ { p = $2 } /^Version:/ { print p, $2 }' | sort > "$MCVDIR/${D}_packages"
done
# Workaround: debian used to provide a patch to uniq which added a -W option,
@@ -46,10 +46,11 @@
}
# get all the packages
-awk '{print $1, "NOTFOUND"}' $MCVDIR/{${DIST1},${DIST2}}_packages | sort | uniq > $MCVDIR/all_packages
+awk '{print $1, "NOTFOUND"}' "$MCVDIR/${DIST1}_packages" "$MCVDIR/${DIST2}_packages" | sort | uniq > "$MCVDIR/all_packages"
# add missing packages to the pkg lists
-for D in $DIST1 $DIST2; do
- cat $MCVDIR/{${D},all}_packages | sort --stable -k 1,1 | uniqW1 > $MCVDIR/${D}_packages_complete
+for D in "$DIST1" "$DIST2"; do
+ cat "$MCVDIR/${D}_packages" "$MCVDIR/all_packages"| sort --stable -k 1,1 | uniqW1 > "$MCVDIR/${D}_packages_complete"
done
-join $MCVDIR/{${DIST1},${DIST2}}_packages_complete
-rm -rf $MCVDIR
+join "$MCVDIR/${DIST1}_packages_complete" "$MCVDIR/${DIST2}_packages_complete"
+
+rm -rf "$MCVDIR"
Modified: multidistrotools/trunk/scripts/depends.bash
===================================================================
--- multidistrotools/trunk/scripts/depends.bash 2006-11-19 23:03:25 UTC (rev 4)
+++ multidistrotools/trunk/scripts/depends.bash 2006-11-28 13:47:51 UTC (rev 5)
@@ -19,7 +19,7 @@
fi
(for i in $*; do
- echo $i
+ echo "$i"
done
if [ "$REVERSE" == '-r' ]; then
LC_ALL=C apt-rdepends $REVERSE $* |grep "Reverse Depends" | awk '{print $3}'
Modified: multidistrotools/trunk/scripts/dist-apt-cache.bash
===================================================================
--- multidistrotools/trunk/scripts/dist-apt-cache.bash 2006-11-19 23:03:25 UTC (rev 4)
+++ multidistrotools/trunk/scripts/dist-apt-cache.bash 2006-11-28 13:47:51 UTC (rev 5)
@@ -23,10 +23,10 @@
exit 1
fi
-ID=$1
-if [ ! -d $HOME/.multidistrotools/$ID ]; then
+ID="$1"
+if [ ! -d "$HOME/.multidistrotools/$ID" ]; then
echo "APT tree named $ID doesn't exist in $HOME/.multidistrotools."
exit 1
fi
shift
-apt-cache -o Dir=$HOME/.multidistrotools/$ID/ -o Dir::State::status=$HOME/.multidistrotools/$ID/var/lib/dpkg/status $*
+apt-cache -o "Dir=$HOME/.multidistrotools/$ID/" -o "Dir::State::status=$HOME/.multidistrotools/$ID/var/lib/dpkg/status" $*
Modified: multidistrotools/trunk/scripts/dist-apt-get.bash
===================================================================
--- multidistrotools/trunk/scripts/dist-apt-get.bash 2006-11-19 23:03:25 UTC (rev 4)
+++ multidistrotools/trunk/scripts/dist-apt-get.bash 2006-11-28 13:47:51 UTC (rev 5)
@@ -23,10 +23,10 @@
exit 1
fi
-ID=$1
+ID="$1"
if [ ! -d $HOME/.multidistrotools/$ID ]; then
echo "APT tree named $ID doesn't exist in $HOME/.multidistrotools."
exit 1
fi
shift
-apt-get -o Dir=$HOME/.multidistrotools/$ID/ -o Dir::State::status=$HOME/.multidistrotools/$ID/var/lib/dpkg/status $*
+apt-get -o "Dir=$HOME/.multidistrotools/$ID/" -o "Dir::State::status=$HOME/.multidistrotools/$ID/var/lib/dpkg/status" $*
Modified: multidistrotools/trunk/scripts/dist-create.bash
===================================================================
--- multidistrotools/trunk/scripts/dist-create.bash 2006-11-19 23:03:25 UTC (rev 4)
+++ multidistrotools/trunk/scripts/dist-create.bash 2006-11-28 13:47:51 UTC (rev 5)
@@ -34,8 +34,8 @@
exit 1
fi
-ID=$1
-SUITE_HOME=$HOME/.multidistrotools/$ID
+ID="$1"
+SUITE_HOME="$HOME/.multidistrotools/$ID"
shift
SETTINGS=$*
CHROOT_DIRS="etc/apt var/lib/apt/lists/partial var/lib/dpkg var/cache/apt/archives/partial"
@@ -43,10 +43,10 @@
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"
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"
Modified: multidistrotools/trunk/scripts/dist-grep-dctrl-packages.bash
===================================================================
--- multidistrotools/trunk/scripts/dist-grep-dctrl-packages.bash 2006-11-19 23:03:25 UTC (rev 4)
+++ multidistrotools/trunk/scripts/dist-grep-dctrl-packages.bash 2006-11-28 13:47:51 UTC (rev 5)
@@ -24,10 +24,10 @@
exit 1
fi
-ID=$1
-if [ ! -d $HOME/.multidistrotools/$ID ]; then
+ID="$1"
+if [ ! -d "$HOME/.multidistrotools/$ID" ]; then
echo "APT tree named $ID doesn't exist in $HOME/.multidistrotools."
exit 1
fi
shift
-grep-dctrl $* $HOME/.multidistrotools/$ID/var/lib/apt/lists/*_Packages
+grep-dctrl $* "$HOME/.multidistrotools/$ID/var/lib/apt/lists/*_Packages"
Modified: multidistrotools/trunk/scripts/list_diff.bash
===================================================================
--- multidistrotools/trunk/scripts/list_diff.bash 2006-11-19 23:03:25 UTC (rev 4)
+++ multidistrotools/trunk/scripts/list_diff.bash 2006-11-28 13:47:51 UTC (rev 5)
@@ -12,4 +12,4 @@
exit 1
fi
-diff --suppress-common-lines $1 $2 | grep -E '^(<|>)' | cut -c 3-
+diff --suppress-common-lines "$1" "$2" | grep -E '^(<|>)' | cut -c 3-
Modified: multidistrotools/trunk/scripts/list_inter.bash
===================================================================
--- multidistrotools/trunk/scripts/list_inter.bash 2006-11-19 23:03:25 UTC (rev 4)
+++ multidistrotools/trunk/scripts/list_inter.bash 2006-11-28 13:47:51 UTC (rev 5)
@@ -12,5 +12,5 @@
exit 1
fi
-cat $1 $2 | sort | awk '{ if ($0 == l) { print $0 }; l = $0 }' | uniq
+cat "$1" "$2" | sort | awk '{ if ($0 == l) { print $0 }; l = $0 }' | uniq
Modified: multidistrotools/trunk/scripts/list_sub.bash
===================================================================
--- multidistrotools/trunk/scripts/list_sub.bash 2006-11-19 23:03:25 UTC (rev 4)
+++ multidistrotools/trunk/scripts/list_sub.bash 2006-11-28 13:47:51 UTC (rev 5)
@@ -12,4 +12,4 @@
exit 1
fi
-diff --suppress-common-lines $1 $2 | grep -E '^<' | cut -c 3-
+diff --suppress-common-lines "$1" "$2" | grep -E '^<' | cut -c 3-
Modified: multidistrotools/trunk/scripts/list_union.bash
===================================================================
--- multidistrotools/trunk/scripts/list_union.bash 2006-11-19 23:03:25 UTC (rev 4)
+++ multidistrotools/trunk/scripts/list_union.bash 2006-11-28 13:47:51 UTC (rev 5)
@@ -12,4 +12,4 @@
exit 1
fi
-cat $1 $2 | sort | uniq
+cat "$1" "$2" | sort | uniq
Modified: multidistrotools/trunk/scripts/src2bin.bash
===================================================================
--- multidistrotools/trunk/scripts/src2bin.bash 2006-11-19 23:03:25 UTC (rev 4)
+++ multidistrotools/trunk/scripts/src2bin.bash 2006-11-28 13:47:51 UTC (rev 5)
@@ -19,17 +19,17 @@
# echo "Getting binary package for $1" > /dev/stderr
# all packages with binary.name == source.name don't have a Source header
# all packages with binary.name != source.name have a Source header
- apt-cache showsrc $1 |grep -E "^Binary:" |cut -c 9- |tr -d ',' |tr ' ' "\n"
+ apt-cache showsrc "$1" |grep -E "^Binary:" |cut -c 9- |tr -d ',' |tr ' ' "\n"
}
if [ $# -eq 0 ]; then
while read n; do
- getbinpkg $n
+ getbinpkg "$n"
done | sort | uniq
else
if [ "$1" == '--help' ]; then
usage
else
- getbinpkg $1
+ getbinpkg "$1"
fi
fi
Modified: multidistrotools/trunk/scripts/unify.bash
===================================================================
--- multidistrotools/trunk/scripts/unify.bash 2006-11-19 23:03:25 UTC (rev 4)
+++ multidistrotools/trunk/scripts/unify.bash 2006-11-28 13:47:51 UTC (rev 5)
@@ -7,4 +7,4 @@
exit 0
fi
-sort|uniq
+sort | uniq
More information about the Pkg-multidistrotools-commits
mailing list