summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/common.sh2
-rwxr-xr-xfunctions/defaults.sh16
-rwxr-xr-xfunctions/help.sh2
3 files changed, 10 insertions, 10 deletions
diff --git a/functions/common.sh b/functions/common.sh
index e56b80f..efd7922 100755
--- a/functions/common.sh
+++ b/functions/common.sh
@@ -10,4 +10,4 @@
set -e
PROGRAM="`basename ${0}`"
-VERSION="1.0~a24"
+VERSION="1.0~a25"
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 29633de..e548744 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -102,12 +102,12 @@ Set_defaults ()
then
case "${LH_MODE}" in
debian|debian-edu)
- if [ -x "/usr/bin/cdebootstrap" ]
- then
- LH_BOOTSTRAP="cdebootstrap"
- elif [ -x "/usr/sbin/debootstrap" ]
+ if [ -x "/usr/sbin/debootstrap" ]
then
LH_BOOTSTRAP="debootstrap"
+ elif [ -x "/usr/bin/cdebootstrap" ]
+ then
+ LH_BOOTSTRAP="cdebootstrap"
else
echo "E: Can't process file /usr/bin/cdebootstrap or /usr/sbin/debootstrap (FIXME)"
exit 1
@@ -115,12 +115,12 @@ Set_defaults ()
;;
ubuntu)
- if [ -x "/usr/bin/cdebootstrap" ] && [ -d /usr/share/cdebootstrap/generic-ubuntu ]
- then
- LH_BOOTSTRAP="cdebootstrap"
- elif [ -x "/usr/sbin/debootstrap" ] && [ -f /usr/lib/debootstrap/scripts/gutsy ]
+ if [ -x "/usr/sbin/debootstrap" ] && [ -f /usr/lib/debootstrap/scripts/gutsy ]
then
LH_BOOTSTRAP="debootstrap"
+ elif [ -x "/usr/bin/cdebootstrap" ] && [ -d /usr/share/cdebootstrap/generic-ubuntu ]
+ then
+ LH_BOOTSTRAP="cdebootstrap"
else
echo "E: Your version of debootstrap or cdebootstrap is outdated and does not support ubuntu."
exit 1
diff --git a/functions/help.sh b/functions/help.sh
index 6427639..0748ab2 100755
--- a/functions/help.sh
+++ b/functions/help.sh
@@ -18,7 +18,7 @@ Help ()
if [ -n "${USAGE}" ]
then
- echo " ${USAGE}"
+ echo -e "${USAGE}"
echo
fi