summaryrefslogtreecommitdiff
path: root/functions/defaults.sh
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2008-01-15 08:25:29 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:35:39 +0100
commit342d2870ebe66fc987bbb6523c67885631eb0e00 (patch)
tree6d9332db2197bb7b54e3e3b97f83474cd2430e56 /functions/defaults.sh
parente8e4001524ee6fa47ce7ffe06da39b6d43e065d2 (diff)
downloadvyos-live-build-342d2870ebe66fc987bbb6523c67885631eb0e00.tar.gz
vyos-live-build-342d2870ebe66fc987bbb6523c67885631eb0e00.zip
Consistently using the pipe as seperator in sed commands now.
Diffstat (limited to 'functions/defaults.sh')
-rwxr-xr-xfunctions/defaults.sh16
1 files changed, 8 insertions, 8 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index a3ab9a1fa..e86163b95 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -436,24 +436,24 @@ 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/laptop//' -e 's/gnome-desktop//' -e 's/desktop//') standard laptop gnome-desktop 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|laptop||' -e 's|gnome-desktop||' -e 's|desktop||') standard laptop gnome-desktop desktop"
;;
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/laptop//' -e 's/kde-desktop//' -e 's/desktop//') standard laptop kde-desktop 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|laptop||' -e 's|kde-desktop||' -e 's|desktop||') standard laptop kde-desktop desktop"
;;
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/laptop//' -e 's/xfce-desktop//' -e 's/desktop//') standard laptop xfce-desktop 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|laptop||' -e 's|xfce-desktop||' -e 's|desktop||') standard laptop xfce-desktop desktop"
;;
esac
done
- LH_PACKAGES_LISTS="$(echo ${LH_PACKAGES_LISTS} | sed -e 's/ //g')"
- LH_TASKS="$(echo ${LH_TASKS} | sed -e 's/ //g')"
+ LH_PACKAGES_LISTS="$(echo ${LH_PACKAGES_LISTS} | sed -e 's| ||g')"
+ LH_TASKS="$(echo ${LH_TASKS} | sed -e 's| ||g')"
# Setting tasks
# LH_TASKS