josch/polystrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

solve some whitespace issues

Browse source
This commit is contained in:
josch 2011-06-30 08:49:28 +02:00
parent b1f4e66ec1
commit c1286dae35
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
polystrap.sh
View file

@ -33,9 +33,9 @@ export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true LC_ALL=C
export PATH=$PATH:/usr/sbin:/sbin export PATH=$PATH:/usr/sbin:/sbin
if [ "$FAKEROOTKEY" = "" ]; then if [ "$FAKEROOTKEY" = "" ]; then
echo "I: re-executing script inside fakeroot" >&2 echo "I: re-executing script inside fakeroot" >&2
fakeroot "$0" "$@"; fakeroot "$0" "$@";
exit exit
fi fi
while getopts s:a:d:m:p: opt; do while getopts s:a:d:m:p: opt; do
@ -98,7 +98,7 @@ echo "I: create multistrap.conf" >&2
MULTISTRAPCONF=`tempfile -d . -p multistrap` MULTISTRAPCONF=`tempfile -d . -p multistrap`
echo -n > "$MULTISTRAPCONF" echo -n > "$MULTISTRAPCONF"
while read line; do while read line; do
eval echo $line >> "$MULTISTRAPCONF" eval echo $line >> "$MULTISTRAPCONF"
done < $PLATFORM/multistrap.conf done < $PLATFORM/multistrap.conf
# download and extract packages # download and extract packages
@ -143,9 +143,9 @@ fi
# run preinst scripts # run preinst scripts
for script in $ROOTDIR/var/lib/dpkg/info/*.preinst; do for script in $ROOTDIR/var/lib/dpkg/info/*.preinst; do
[ "$script" = "$ROOTDIR/var/lib/dpkg/info/bash.preinst" ] && continue [ "$script" = "$ROOTDIR/var/lib/dpkg/info/bash.preinst" ] && continue
echo "I: run preinst script ${script##$ROOTDIR}" >&2 echo "I: run preinst script ${script##$ROOTDIR}" >&2
fakechroot chroot $ROOTDIR ${script##$ROOTDIR} install fakechroot chroot $ROOTDIR ${script##$ROOTDIR} install
done done
# run dpkg --configure -a twice because of errors during the first run # run dpkg --configure -a twice because of errors during the first run