help/usage: fix overly complex script description handling

Closes: #952887
2015-02-05 03:30:47 +00:00 · 2015-02-05 03:30:47 +00:00 · a67e01638f
parent aa858eb2c8
commit a67e01638f
70 changed files with 70 additions and 70 deletions
--- a/frontend/lb
+++ b/frontend/lb
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'utility to build live systems')"
+DESCRIPTION="Utility to build live systems"
 HELP=""
 USAGE="lb {clean|config|build}"

--- a/functions/help.sh
+++ b/functions/help.sh
@ -10,7 +10,7 @@

 Help ()
 {
-	printf "%s - %s\n\n" "${PROGRAM_NAME}" "${DESCRIPTION}"
+	printf "%s - %s\n\n\n" "${PROGRAM_NAME}" "${DESCRIPTION}"
 	printf "Usage:\n\n"

 	if [ -n "${USAGE}" ]
--- a/functions/usage.sh
+++ b/functions/usage.sh
@ -10,7 +10,7 @@

 Usage ()
 {
-	printf "%s - %s\n\n" "${PROGRAM_NAME}" "${DESCRIPTION}"
+	printf "%s - %s\n\n\n" "${PROGRAM_NAME}" "${DESCRIPTION}"
 	printf "Usage:\n\n"

 	if [ -n "${USAGE}" ]
--- a/scripts/build/binary
+++ b/scripts/build/binary
@ -21,7 +21,7 @@ then
 fi

 # Setting static variables
-DESCRIPTION="$(Echo 'build binary images')"
+DESCRIPTION="Build binary images"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/binary_checksums
+++ b/scripts/build/binary_checksums
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'create binary checksums')"
+DESCRIPTION="Create binary checksums"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/binary_chroot
+++ b/scripts/build/binary_chroot
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'copy chroot into chroot')"
+DESCRIPTION="Copy chroot into chroot"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/binary_disk
+++ b/scripts/build/binary_disk
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'install disk information into binary')"
+DESCRIPTION="Install disk information into binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/binary_grub-efi
+++ b/scripts/build/binary_grub-efi
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'prepares and installs Grub based EFI support into binary')"
+DESCRIPTION="Prepares and installs Grub based EFI support into binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/binary_grub-legacy
+++ b/scripts/build/binary_grub-legacy
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'installs grub-legacy into binary')"
+DESCRIPTION="Installs grub-legacy into binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/binary_grub-pc
+++ b/scripts/build/binary_grub-pc
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'installs grub-pc into binary')"
+DESCRIPTION="Installs grub-pc into binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/binary_hdd
+++ b/scripts/build/binary_hdd
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'build binary image')"
+DESCRIPTION="Build binary image"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/binary_hooks
+++ b/scripts/build/binary_hooks
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'execute hooks in binary')"
+DESCRIPTION="Execute hooks in binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/binary_includes
+++ b/scripts/build/binary_includes
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'copy files into binary')"
+DESCRIPTION="Copy files into binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/binary_iso
+++ b/scripts/build/binary_iso
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'build iso binary image')"
+DESCRIPTION="Build iso binary image"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/binary_linux-image
+++ b/scripts/build/binary_linux-image
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'install linux-image into binary')"
+DESCRIPTION="Install linux-image into binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/binary_loadlin
+++ b/scripts/build/binary_loadlin
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'copy loadlin into binary')"
+DESCRIPTION="Copy loadlin into binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/binary_loopback_cfg
+++ b/scripts/build/binary_loopback_cfg
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'installs loopback.cfg into binary')"
+DESCRIPTION="Installs loopback.cfg into binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/binary_manifest
+++ b/scripts/build/binary_manifest
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'create manifest')"
+DESCRIPTION="Create manifest"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/binary_memtest
+++ b/scripts/build/binary_memtest
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'installs a memtest into binary')"
+DESCRIPTION="Installs a memtest into binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/binary_netboot
+++ b/scripts/build/binary_netboot
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'build netboot binary image')"
+DESCRIPTION="Build netboot binary image"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/binary_onie
+++ b/scripts/build/binary_onie
@ -15,7 +15,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'build ONIE binary image')"
+DESCRIPTION="Build ONIE binary image"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/binary_package-lists
+++ b/scripts/build/binary_package-lists
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'install local packages into binary')"
+DESCRIPTION="Install local packages into binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/binary_rootfs
+++ b/scripts/build/binary_rootfs
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'build rootfs image')"
+DESCRIPTION="Build rootfs image"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'installs syslinux into binary')"
+DESCRIPTION="Installs syslinux into binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/binary_tar
+++ b/scripts/build/binary_tar
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'build binary tarball')"
+DESCRIPTION="Build binary tarball"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/binary_win32-loader
+++ b/scripts/build/binary_win32-loader
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'copy win32-loader into binary')"
+DESCRIPTION="Copy win32-loader into binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/binary_zsync
+++ b/scripts/build/binary_zsync
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'build zsync control files')"
+DESCRIPTION="Build zsync control files"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/bootstrap
+++ b/scripts/build/bootstrap
@ -21,7 +21,7 @@ then
 fi

 # Setting static variables
-DESCRIPTION="$(Echo 'bootstrap a Debian system')"
+DESCRIPTION="Bootstrap a Debian system"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/bootstrap_archives
+++ b/scripts/build/bootstrap_archives
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'manage /etc/apt/sources.list')"
+DESCRIPTION="Manage /etc/apt/sources.list"
 HELP=""
 USAGE="${PROGRAM} [source|binary] [--force]"

--- a/scripts/build/bootstrap_cache
+++ b/scripts/build/bootstrap_cache
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'cache bootstrap stage')"
+DESCRIPTION="Cache bootstrap stage"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/bootstrap_debootstrap
+++ b/scripts/build/bootstrap_debootstrap
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'bootstrap a Debian system with debootstrap(8)')"
+DESCRIPTION="Bootstrap a Debian system with debootstrap(8)"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/build
+++ b/scripts/build/build
@ -34,7 +34,7 @@ then
 fi

 # Setting static variables
-DESCRIPTION="$(Echo 'build a Debian Live system')"
+DESCRIPTION="Build a Debian Live system"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/chroot
+++ b/scripts/build/chroot
@ -21,7 +21,7 @@ then
 fi

 # Setting static variables
-DESCRIPTION="$(Echo 'customize the Debian system')"
+DESCRIPTION="Customize the Debian system"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/chroot_apt
+++ b/scripts/build/chroot_apt
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'manage /etc/apt/apt.conf')"
+DESCRIPTION="Manage /etc/apt/apt.conf"
 HELP=""
 USAGE="${PROGRAM} {install|install-binary|remove} [--force]"

--- a/scripts/build/chroot_archives
+++ b/scripts/build/chroot_archives
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'manage /etc/apt/sources.list')"
+DESCRIPTION="Manage /etc/apt/sources.list"
 HELP=""
 USAGE="${PROGRAM} {source|binary} {install|remove} [--force]"

--- a/scripts/build/chroot_cache
+++ b/scripts/build/chroot_cache
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'cache chroot stage')"
+DESCRIPTION="Cache chroot stage"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/chroot_debianchroot
+++ b/scripts/build/chroot_debianchroot
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'manage /etc/debian_chroot')"
+DESCRIPTION="Manage /etc/debian_chroot"
 HELP=""
 USAGE="${PROGRAM} {install|remove} [--force]"

--- a/scripts/build/chroot_devpts
+++ b/scripts/build/chroot_devpts
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'mount /dev/pts')"
+DESCRIPTION="Mount /dev/pts"
 HELP=""
 USAGE="${PROGRAM} {install|remove} [--force]"

--- a/scripts/build/chroot_dpkg
+++ b/scripts/build/chroot_dpkg
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'manage /sbin/dpkg')"
+DESCRIPTION="Manage /sbin/dpkg"
 HELP=""
 USAGE="${PROGRAM} {install|remove} [--force]"

--- a/scripts/build/chroot_firmware
+++ b/scripts/build/chroot_firmware
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'schedule kernel packages for installation')"
+DESCRIPTION="Schedule kernel packages for installation"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/chroot_hacks
+++ b/scripts/build/chroot_hacks
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'execute hacks in chroot')"
+DESCRIPTION="Execute hacks in chroot"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/chroot_hooks
+++ b/scripts/build/chroot_hooks
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'execute hooks in chroot')"
+DESCRIPTION="Execute hooks in chroot"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/chroot_hostname
+++ b/scripts/build/chroot_hostname
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'manage /bin/hostname')"
+DESCRIPTION="Manage /bin/hostname"
 HELP=""
 USAGE="${PROGRAM} {install|remove} [--force]"

--- a/scripts/build/chroot_hosts
+++ b/scripts/build/chroot_hosts
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'manage /etc/hosts')"
+DESCRIPTION="Manage /etc/hosts"
 HELP=""
 USAGE="${PROGRAM} {install|remove} [--force]"

--- a/scripts/build/chroot_includes
+++ b/scripts/build/chroot_includes
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'copy files into chroot')"
+DESCRIPTION="Copy files into chroot"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/chroot_install-packages
+++ b/scripts/build/chroot_install-packages
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'install queued packages into chroot')"
+DESCRIPTION="Install queued packages into chroot"
 HELP=""
 USAGE="${PROGRAM} {install|live} [--force]"

--- a/scripts/build/chroot_interactive
+++ b/scripts/build/chroot_interactive
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'make build interactive')"
+DESCRIPTION="Make build interactive"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/chroot_linux-image
+++ b/scripts/build/chroot_linux-image
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'schedule kernel packages for installation')"
+DESCRIPTION="Schedule kernel packages for installation"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/chroot_package-lists
+++ b/scripts/build/chroot_package-lists
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'queue install of package lists into chroot')"
+DESCRIPTION="Queue install of package lists into chroot"
 HELP=""
 USAGE="${PROGRAM} {install|live} [--force]"

--- a/scripts/build/chroot_preseed
+++ b/scripts/build/chroot_preseed
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'execute local preseed in chroot')"
+DESCRIPTION="Execute local preseed in chroot"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/chroot_proc
+++ b/scripts/build/chroot_proc
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'mount /proc')"
+DESCRIPTION="Mount /proc"
 HELP=""
 USAGE="${PROGRAM} {install|remove} [--force]"

--- a/scripts/build/chroot_resolv
+++ b/scripts/build/chroot_resolv
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'manage /etc/resolv.conf')"
+DESCRIPTION="Manage /etc/resolv.conf"
 HELP=""
 USAGE="${PROGRAM} {install|remove} [--force]"

--- a/scripts/build/chroot_selinuxfs
+++ b/scripts/build/chroot_selinuxfs
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'mount /sys/fs/selinux')"
+DESCRIPTION="Mount /sys/fs/selinux"
 HELP=""
 USAGE="${PROGRAM} {install|remove} [--force]"

--- a/scripts/build/chroot_sysfs
+++ b/scripts/build/chroot_sysfs
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'mount /sys')"
+DESCRIPTION="Mount /sys"
 HELP=""
 USAGE="${PROGRAM} {install|remove} [--force]"

--- a/scripts/build/chroot_sysv-rc
+++ b/scripts/build/chroot_sysv-rc
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'manage /usr/sbin/policy-rc.d')"
+DESCRIPTION="Manage /usr/sbin/policy-rc.d"
 HELP=""
 USAGE="${PROGRAM} {install|remove} [--force]"

--- a/scripts/build/chroot_tmpfs
+++ b/scripts/build/chroot_tmpfs
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'use tmpfs to speedup the build')"
+DESCRIPTION="Use tmpfs to speedup the build"
 HELP=""
 USAGE="${PROGRAM} {install|remove} [--force]"

--- a/scripts/build/clean
+++ b/scripts/build/clean
@ -27,7 +27,7 @@ then
 fi

 # Setting static variables
-DESCRIPTION="$(Echo 'clean up system build directories')"
+DESCRIPTION="Clean up system build directories"
 HELP=""
 USAGE="${PROGRAM} [--all] [--cache] [--chroot] [--binary] [--purge] [--remove] [--stage] [--source]"

--- a/scripts/build/config
+++ b/scripts/build/config
@ -15,7 +15,7 @@ set -e

 # Setting static variables
 PROGRAM="lb config"
-DESCRIPTION="$(Echo 'create configuration for live-build(7)')"
+DESCRIPTION="Create configuration for live-build(7)"
 USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
 \t    [--apt-ftp-proxy URL]\n\
 \t    [--apt-http-proxy URL]\n\
--- a/scripts/build/installer
+++ b/scripts/build/installer
@ -21,7 +21,7 @@ then
 fi

 # Setting static variables
-DESCRIPTION="$(Echo 'preparing installer images')"
+DESCRIPTION="Preparing installer images"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/installer_debian-installer
+++ b/scripts/build/installer_debian-installer
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'install debian-installer into binary')"
+DESCRIPTION="Install debian-installer into binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/installer_preseed
+++ b/scripts/build/installer_preseed
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'include local preseed in installer')"
+DESCRIPTION="Include local preseed in installer"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/source
+++ b/scripts/build/source
@ -21,7 +21,7 @@ then
 fi

 # Setting static variables
-DESCRIPTION="$(Echo 'build source images')"
+DESCRIPTION="Build source images"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/source_checksums
+++ b/scripts/build/source_checksums
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'create source checksums')"
+DESCRIPTION="Create source checksums"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/source_debian
+++ b/scripts/build/source_debian
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'debian sources')"
+DESCRIPTION="Debian sources"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/source_disk
+++ b/scripts/build/source_disk
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'install disk information into source')"
+DESCRIPTION="Install disk information into source"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/source_hdd
+++ b/scripts/build/source_hdd
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'build source image')"
+DESCRIPTION="Build source image"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/source_hooks
+++ b/scripts/build/source_hooks
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'execute hooks in source')"
+DESCRIPTION="Execute hooks in source"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/source_iso
+++ b/scripts/build/source_iso
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'build iso source image')"
+DESCRIPTION="Build iso source image"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/source_live
+++ b/scripts/build/source_live
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'copy live config into source')"
+DESCRIPTION="Copy live config into source"
 HELP=""
 USAGE="${PROGRAM} [--force]"

--- a/scripts/build/source_tar
+++ b/scripts/build/source_tar
@ -14,7 +14,7 @@ set -e
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh

 # Setting static variables
-DESCRIPTION="$(Echo 'build source tarball')"
+DESCRIPTION="Build source tarball"
 HELP=""
 USAGE="${PROGRAM} [--force]"