1.1 --- a/user-apt Sun Aug 26 19:28:26 2007 +0200
1.2 +++ b/user-apt Sun Aug 26 19:44:27 2007 +0200
1.3 @@ -1,10 +1,13 @@
1.4 #!/bin/bash
1.5
1.6 # Configuration:
1.7 -if [ -e /etc/defaults/userinstall ]; then
1.8 - source /etc/defaults/userinstall
1.9 +if [ -e userinstall-defaults ]; then
1.10 + source userinstall-defaults
1.11 +elif [ -e /etc/defaults/userinstall ]; then
1.12 + source /etc/defaults/userinstall
1.13 else
1.14 - source userinstall-defaults
1.15 + echo "No defaults found for userinstall."
1.16 + exit 1
1.17 fi
1.18
1.19 fakeroot fakechroot chroot $PACKAGEROOT apt-get $*
2.1 --- a/user-dpkg-i Sun Aug 26 19:28:26 2007 +0200
2.2 +++ b/user-dpkg-i Sun Aug 26 19:44:27 2007 +0200
2.3 @@ -1,10 +1,13 @@
2.4 #!/bin/bash
2.5
2.6 # Configuration:
2.7 -if [ -e /etc/defaults/userinstall ]; then
2.8 +if [ -e userinstall-defaults ]; then
2.9 + source userinstall-defaults
2.10 +elif [ -e /etc/defaults/userinstall ]; then
2.11 source /etc/defaults/userinstall
2.12 else
2.13 - source userinstall-defaults
2.14 + echo "No defaults found for userinstall."
2.15 + exit 1
2.16 fi
2.17
2.18 export PERSONAL=$PACKAGEROOT/personal
3.1 --- a/user-setup Sun Aug 26 19:28:26 2007 +0200
3.2 +++ b/user-setup Sun Aug 26 19:44:27 2007 +0200
3.3 @@ -2,11 +2,13 @@
3.4 # Usage: user-setup [ <mirror> ]
3.5
3.6 # Configuration:
3.7 -if [ -e /etc/defaults/userinstall ]; then
3.8 +if [ -e userinstall-defaults ]; then
3.9 + source userinstall-defaults
3.10 +elif [ -e /etc/defaults/userinstall ]; then
3.11 source /etc/defaults/userinstall
3.12 else
3.13 - source userinstall-defaults
3.14 + echo "No defaults found for userinstall."
3.15 + exit 1
3.16 fi
3.17
3.18 fakeroot fakechroot debootstrap --variant=fakechroot $DISTNAME $PACKAGEROOT $1
3.19 -./user-apt -f install