diff options
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/conffile.sh | 6 | ||||
| -rwxr-xr-x | functions/defaults.sh | 16 | ||||
| -rwxr-xr-x | functions/losetup.sh | 2 | ||||
| -rwxr-xr-x | functions/packages.sh | 2 | ||||
| -rwxr-xr-x | functions/packageslists.sh | 4 |
5 files changed, 15 insertions, 15 deletions
diff --git a/functions/conffile.sh b/functions/conffile.sh index f60abe2..d0291e2 100755 --- a/functions/conffile.sh +++ b/functions/conffile.sh @@ -12,9 +12,9 @@ set -e Read_conffile () { FILES="${1} ${1}.${LH_ARCHITECTURE} ${1}.${DISTRIBUTION}" - FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's/^lh_//')" - FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's/^lh_//').${ARCHITECTURE}" - FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's/^lh_//').${DISTRIBUTION}" + FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lh_||')" + FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lh_||').${ARCHITECTURE}" + FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lh_||').${DISTRIBUTION}" for FILE in ${FILES} do diff --git a/functions/defaults.sh b/functions/defaults.sh index a3ab9a1..e86163b 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 diff --git a/functions/losetup.sh b/functions/losetup.sh index b2a4f06..c3e90bc 100755 --- a/functions/losetup.sh +++ b/functions/losetup.sh @@ -27,7 +27,7 @@ Losetup () ${LH_ROOT_COMMAND} ${LH_LOSETUP} "${DEVICE}" "${FILE}" else - CYLINDERS="$(echo "$FDISK_OUT" | sed -ne "s_^$LOOPDEVICE[ *]*\([0-9]*\).*_\1_p")" + CYLINDERS="$(echo "$FDISK_OUT" | sed -ne "s|^$LOOPDEVICE[ *]*\([0-9]*\).*|\1|p")" OFFSET="$(expr ${CYLINDERS} '*' 512)" Echo_message "Mounting ${DEVICE} with offset ${OFFSET}" diff --git a/functions/packages.sh b/functions/packages.sh index dadb007..645b6c4 100755 --- a/functions/packages.sh +++ b/functions/packages.sh @@ -89,7 +89,7 @@ Check_installed () INSTALL_STATUS=1 fi else - FILE="$(echo ${FILE} | sed -e 's/chroot//')" + FILE="$(echo ${FILE} | sed -e 's|chroot||')" if [ ! -e "${FILE}" ] then diff --git a/functions/packageslists.sh b/functions/packageslists.sh index 1ef64e3..cdec22c 100755 --- a/functions/packageslists.sh +++ b/functions/packageslists.sh @@ -34,9 +34,9 @@ Expand_packagelist_file () shift shift - for INCLUDE in $(sed -ne 's/^#<include> \(.*\)/\1/gp' "${FILE}"); + for INCLUDE in $(sed -ne 's|^#<include> \(.*\)|\1|gp' "${FILE}"); do Expand_packagelist "${INCLUDE}" "${@}" done - sed -ne 's/^\([^#].*\)/\1\n/gp' "${FILE}" + sed -ne 's|^\([^#].*\)|\1\n|gp' "${FILE}" } |