summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-02-21 00:37:32 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:04 +0100
commitafa0ce7b8405da9dd4c77744c96e97dc65e9650d (patch)
treecf686a1a4160dc5c862dec73788cdf3eddc6df56
parent585a301424443e82e5b680d2b1fcb438c3d8a0cf (diff)
downloadlive-build-afa0ce7b8405da9dd4c77744c96e97dc65e9650d.zip
live-build-afa0ce7b8405da9dd4c77744c96e97dc65e9650d.tar.gz
Updating tasks handling for squeeze.
-rwxr-xr-xfunctions/defaults.sh42
1 files changed, 38 insertions, 4 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index f46ec23..140cc65 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -618,22 +618,56 @@ Set_defaults ()
gnome-desktop)
LH_PACKAGES_LISTS="$(echo ${LH_PACKAGES_LISTS} | sed -e 's|gnome-desktop||') standard-x11"
- LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|gnome-desktop||' -e 's|desktop||') standard gnome-desktop desktop"
+ case "${LH_DISTRIBUTION}" in
+ lenny)
+ LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|gnome-desktop||' -e 's|desktop||') standard gnome-desktop desktop"
+ ;;
+
+ *)
+ LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|gnome-desktop||' -e 's|desktop||' -e 's|laptop||') standard gnome-desktop desktop laptop"
+ ;;
+ esac
;;
kde-desktop)
LH_PACKAGES_LISTS="$(echo ${LH_PACKAGES_LISTS} | sed -e 's|kde-desktop||') standard-x11"
- LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|kde-desktop||' -e 's|desktop||') standard kde-desktop desktop"
+
+ case "${LH_DISTRIBUTION}" in
+ lenny)
+ LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|kde-desktop||' -e 's|desktop||') standard kde-desktop desktop"
+ ;;
+
+ *)
+ LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|kde-desktop||' -e 's|desktop||' -e 's|laptop||') standard kde-desktop desktop laptop"
+ esac
;;
lxde-desktop)
LH_PACKAGES_LISTS="$(echo ${LH_PACKAGES_LISTS} | sed -e 's|lxde-desktop||') standard-x11"
- LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|lxde-desktop||' -e 's|desktop||') standard lxde-desktop desktop"
+
+ case "${LH_DISTRIBUTION}" in
+ lenny)
+ LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|lxde-desktop||' -e 's|desktop||') standard lxde-desktop desktop"
+ ;;
+
+ *)
+ LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|lxde-desktop||' -e 's|desktop||' -e 's|laptop||') standard lxde-desktop desktop laptop"
+ ;;
+ esac
;;
xfce-desktop)
LH_PACKAGES_LISTS="$(echo ${LH_PACKAGES_LISTS} | sed -e 's|xfce-desktop||') standard-x11"
- LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|xfce-desktop||' -e 's|desktop||') standard xfce-desktop desktop"
+
+ case "${LH_DISTRIBUTION}" in
+ lenny)
+ LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|xfce-desktop||' -e 's|desktop||') standard xfce-desktop desktop"
+ ;;
+
+ *)
+ LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|xfce-desktop||' -e 's|desktop||' -e 's|laptop||') standard xfce-desktop desktop laptop"
+ ;;
+ esac
;;
esac
done