Replacing some references to live-helper with live-build.

14 files changed, 29 insertions, 127 deletions

diff --git a/Makefile b/Makefile
index 33c78b4e2..aeb83189b 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ install:
 
 	# Installing executables
 	mkdir -p $(DESTDIR)/usr/bin
-	mv $(DESTDIR)/usr/share/live/build/scripts/build/lh $(DESTDIR)/usr/share/live/build/scripts/build/live-helper $(DESTDIR)/usr/bin
+	mv $(DESTDIR)/usr/share/live/build/scripts/build/lb $(DESTDIR)/usr/share/live/build/scripts/build/live-build $(DESTDIR)/usr/bin
 
 	# Installing documentation
 	mkdir -p $(DESTDIR)/usr/share/doc/live-build
@@ -76,7 +76,7 @@ uninstall:
 	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/live
 
 	# Uninstalling executables
-	rm -f $(DESTDIR)/usr/bin/lh $(DESTDIR)/usr/bin/live-helper
+	rm -f $(DESTDIR)/usr/bin/lb $(DESTDIR)/usr/bin/live-build
 
 	# Uninstalling documentation
 	rm -rf $(DESTDIR)/usr/share/doc/live-build
diff --git a/functions/common.sh b/functions/common.sh
index 2f95fe4c2..9ce49bc97 100755
--- a/functions/common.sh
+++ b/functions/common.sh
@@ -8,7 +8,7 @@
 ## under certain conditions; see COPYING for details.
 
 
-PACKAGE="live-helper"
+PACKAGE="live-build"
 VERSION="2.0~a23-1"
 CONFIG_VERSION="$(echo ${VERSION} | awk -F- '{ print $1 }')"
 
diff --git a/functions/defaults.sh b/functions/defaults.sh
index edb9ca25f..d73aee9ee 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -961,7 +961,7 @@ Set_defaults ()
 	fi
 
 	# Set iso preparer
-	LH_ISO_PREPARER="${LH_ISO_PREPARER:-live-helper \$VERSION; http://packages.qa.debian.org/live-helper}"
+	LH_ISO_PREPARER="${LH_ISO_PREPARER:-live-build \$VERSION; http://packages.qa.debian.org/live-build}"
 
 	# Set iso publisher
 	LH_ISO_PUBLISHER="${LH_ISO_PUBLISHER:-Debian Live project; http://debian-live.alioth.debian.org/; debian-live@lists.debian.org}"
@@ -1097,20 +1097,20 @@ Check_defaults ()
 	then
 		# We're only checking when we're actually running the checks
 		# that's why the check for emptyness of the version;
-		# however, as live-helper always declares LH_CONFIG_VERSION
+		# however, as live-build always declares LH_CONFIG_VERSION
 		# internally, this is safe assumption (no cases where it's unset,
 		# except when bootstrapping the functions/defaults etc.).
 		CURRENT_CONFIG_VERSION="$(echo ${LH_CONFIG_VERSION} | awk -F. '{ print $1 }')"
 
 		if [ ${CURRENT_CONFIG_VERSION} -ge 3 ]
 		then
-			Echo_error "This config tree is too new for this version of live-helper (${VERSION})."
-			Echo_error "Aborting build, please get a new version of live-helper."
+			Echo_error "This config tree is too new for this version of live-build (${VERSION})."
+			Echo_error "Aborting build, please get a new version of live-build."
 
 			exit 1
 		elif [ ${CURRENT_CONFIG_VERSION} -eq 1 ]
 		then
-			Echo_error "This config tree is too old for this version of live-helper (${VERSION})."
+			Echo_error "This config tree is too old for this version of live-build (${VERSION})."
 			Echo_error "Aborting build, please repopulate the config tree."
 			exit 1
 		elif [ ${CURRENT_CONFIG_VERSION} -lt 1 ]
@@ -1155,7 +1155,7 @@ Check_defaults ()
 			# grub or yaboot + usb
 			case "${LH_BOOTLOADER}" in
 				grub|yaboot)
-					Echo_error "You have selected a combination of bootloader and image type that is currently not supported by live-helper. Please use either another bootloader or a different image type."
+					Echo_error "You have selected a combination of bootloader and image type that is currently not supported by live-build. Please use either another bootloader or a different image type."
 					exit 1
 					;;
 			esac
diff --git a/scripts/build/binary_grub b/scripts/build/binary_grub
index f9505d597..b58b189c9 100755
--- a/scripts/build/binary_grub
+++ b/scripts/build/binary_grub
@@ -144,7 +144,7 @@ case "${LH_BINARY_IMAGES}" in
 		;;
 
 	usb*|net)
-		Echo_warning "Bootloader in this image type not yet supported by live-helper."
+		Echo_warning "Bootloader in this image type not yet supported by live-build."
 		Echo_warning "This would produce a not bootable image, aborting (FIXME)."
 		exit 1
 	;;
diff --git a/scripts/build/binary_grub2 b/scripts/build/binary_grub2
index 34853bf25..33f7ebb6e 100755
--- a/scripts/build/binary_grub2
+++ b/scripts/build/binary_grub2
@@ -118,7 +118,7 @@ case "${LH_BINARY_IMAGES}" in
 		;;
 
 	usb*|net)
-		Echo_warning "Bootloader in this image type not yet supported by live-helper."
+		Echo_warning "Bootloader in this image type not yet supported by live-build."
 		Echo_warning "This would produce a not bootable image, aborting (FIXME)."
 		exit 1
 	;;
diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso
index 6e054280a..3ed330e46 100755
--- a/scripts/build/binary_iso
+++ b/scripts/build/binary_iso
@@ -75,7 +75,7 @@ fi
 # Handle genisoimage generic options
 GENISOIMAGE_OPTIONS="-J -l -cache-inodes -allow-multidot"
 
-# Handle genisoimage live-helper specific options
+# Handle genisoimage live-build specific options
 if [ "${_QUIET}" = "true" ]
 then
 	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet"
@@ -139,7 +139,7 @@ case "${LH_BOOTLOADER}" in
 		;;
 
 	*)
-		Echo_warning "Bootloader on your architecture not yet supported by live-helper."
+		Echo_warning "Bootloader on your architecture not yet supported by live-build."
 		Echo_warning "This will produce a most likely not bootable image (Continuing in 5 seconds)."
 		sleep 5
 		;;
diff --git a/scripts/build/chroot_hacks b/scripts/build/chroot_hacks
index 0156cd9a2..1fd3aa822 100755
--- a/scripts/build/chroot_hacks
+++ b/scripts/build/chroot_hacks
@@ -166,7 +166,7 @@ esac
 Chroot chroot "${UPDATE_INITRAMFS_OPTIONS} update-initramfs -k all -t -u"
 
 # Ensure readable permissions on initramfs. loop-aes-utils sets umask to
-# protect GPG keys, which live-helper does not support.
+# protect GPG keys, which live-build does not support.
 # Note: Use find rather than chmod on the wildcard, one never knows what
 # people might do in local hooks, and there might be no initrds at all.
 find chroot/boot -name 'initrd*' -print0 | xargs -r -0 chmod go+r
diff --git a/scripts/build/chroot_linux-image b/scripts/build/chroot_linux-image
index d67107dfe..7b20232b2 100755
--- a/scripts/build/chroot_linux-image
+++ b/scripts/build/chroot_linux-image
@@ -56,7 +56,7 @@ EOF
 		# Diverting update-initramfs
 		#if [ "${LH_INITRAMFS}" = "live-initramfs" ]
 		#then
-		#	mv chroot/usr/sbin/update-initramfs chroot/usr/sbin/update-initramfs.live-helper
+		#	mv chroot/usr/sbin/update-initramfs chroot/usr/sbin/update-initramfs.live-build
 		#fi
 
 		if [ "${LH_LINUX_PACKAGES}" != "none" ]
diff --git a/scripts/build/chroot_sources b/scripts/build/chroot_sources
index b363cbb70..2747647da 100755
--- a/scripts/build/chroot_sources
+++ b/scripts/build/chroot_sources
@@ -27,7 +27,7 @@ Set_defaults
 # Requiring stage file
 Require_stagefile .stage/config .stage/bootstrap
 
-_LH_LOCAL_KEY_EMAIL="live-helper-local-key@invalid"
+_LH_LOCAL_KEY_EMAIL="live-build-local-key@invalid"
 
 case "${1}" in
 	install)
@@ -242,7 +242,7 @@ case "${1}" in
 						      Key-Length: 1024
 						      Subkey-Type: ELG-E
 						      Subkey-Length: 1024
-						      Name-Real: live-helper local packages key
+						      Name-Real: live-build local packages key
 						      Name-Email: ${_LH_LOCAL_KEY_EMAIL}
 						      Expire-Date: 0
 						      %secring /root/local-package-keyring.sec
diff --git a/scripts/build/config b/scripts/build/config
index 3daed5f90..5bd65a8cc 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -26,8 +26,8 @@ then
 fi
 
 # Setting static variables
-SYSTEM_LH_CONFFILE="/etc/default/live-helper"
-DESCRIPTION="$(Echo 'create configuration for live-helper(7)')"
+SYSTEM_LH_CONFFILE="/etc/default/live-build"
+DESCRIPTION="$(Echo 'create configuration for live-build(7)')"
 USAGE="${PROGRAM} [--apt apt|aptitude]\n\
 \t    [--apt-ftp-proxy URL]\n\
 \t    [--apt-http-proxy URL]\n\
@@ -172,10 +172,10 @@ Local_arguments ()
 				# Dump version
 				if [ -x "$(which dpkg-query 2>/dev/null)" ]
 				then
-					VERSION_DPKG="$(dpkg-query -f='${Version}' --show live-helper)"
+					VERSION_DPKG="$(dpkg-query -f='${Version}' --show live-build)"
 				fi
 
-				Echo "%s: This is live-helper version %s" "${0}" "${VERSION_DPKG:-${VERSION}}"
+				Echo "%s: This is live-build version %s" "${0}" "${VERSION_DPKG:-${VERSION}}"
 
 				# Dump conffile contents
 				Print_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
@@ -829,9 +829,9 @@ mkdir -p config
 mkdir -p config/includes
 mkdir -p config/templates
 
-# Creating live-helper configuration
+# Creating live-build configuration
 cat > config/common << EOF
-# config/common - common options for live-helper(7)
+# config/common - common options for live-build(7)
 
 # LH_CONFIG_VERSION: internal version of the configuration file format
 LH_CONFIG_VERSION="${CONFIG_VERSION}"
@@ -967,7 +967,7 @@ EOF
 
 # Creating lh_bootstrap_* configuration
 cat > config/bootstrap << EOF
-# config/bootstrap - options for live-helper(7), bootstrap stage
+# config/bootstrap - options for live-build(7), bootstrap stage
 
 # \$LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
@@ -1045,7 +1045,7 @@ mkdir -p config/chroot_local-preseed
 mkdir -p config/chroot_sources
 
 cat > config/chroot << EOF
-# config/chroot - options for live-helper(7), chroot stage
+# config/chroot - options for live-build(7), chroot stage
 
 # \$LH_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: ${LH_CHROOT_FILESYSTEM})
@@ -1133,7 +1133,7 @@ mkdir -p config/binary_rootfs
 mkdir -p config/binary_syslinux
 
 cat > config/binary << EOF
-# config/binary - options for live-helper(7), binary stage
+# config/binary - options for live-build(7), binary stage
 
 # \$LH_BINARY_FILESYSTEM: set image filesystem
 # (Default: ${LH_BINARY_FILESYSTEM})
@@ -1295,7 +1295,7 @@ EOF
 
 # Creating lh_source_* configuration
 cat > config/source << EOF
-# config/source - options for live-helper(7), source stage
+# config/source - options for live-build(7), source stage
 
 # \$LH_SOURCE: set source option
 # (Default: ${LH_SOURCE})
diff --git a/scripts/build/lh b/scripts/build/lh
deleted file mode 100755
index 77618023e..000000000
--- a/scripts/build/lh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-##
-## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'utility to build Debian Live systems')"
-HELP="FIXME"
-USAGE="FIXME"
-
-case "${1}" in
-	-h|--help)
-		if [ -x "$(which man 2>/dev/null)" ]
-		then
-			man lh
-			exit 0
-		else
-			${0} --usage
-			exit 0
-		fi
-		;;
-
-	""|-u|--usage)
-		Usage
-		;;
-
-	-v|--version)
-		Version
-		;;
-
-	*)
-		COMMAND="${1}"
-		shift
-
-		if [ -x "${LH_BASE}/scripts/build/${COMMAND}" ]
-		then
-			LH=1 exec "${LH_BASE}/scripts/build/${COMMAND}" "${@}"
-		elif [ -x /usr/share/live/build/scripts/build/${COMMAND} ]
-		then
-			LH=1 exec /usr/share/live/build/scripts/build/"${COMMAND}" "${@}"
-		elif [ -x "$(which ${COMMAND} 2>/dev/null)" ]
-		then
-			LH=1 exec "${COMMAND}" "${@}"
-		else
-			Echo_error "no such script"
-			exit 1
-		fi
-		;;
-esac
diff --git a/scripts/build/live-helper b/scripts/build/live-helper
deleted file mode 100755
index 4341a16e5..000000000
--- a/scripts/build/live-helper
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-##
-## This program is free software: you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program. If not, see <http://www.gnu.org/licenses/>.
-##
-## On Debian systems, the complete text of the GNU General Public License
-## can be found in /usr/share/common-licenses/GPL-3 file.
-
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
-
-if [ -x "$(which man 2>/dev/null)" ]
-then
-	man live-helper
-	exit 0
-else
-	Echo "live-helper is a set of scripts to build Debian Live system images."
-	echo
-	Echo "The idea behind live-helper is a framework that uses a configuration directory to completely automate and customize all aspects of building a Live image."
-	echo
-	Echo "An introduction to live-helper can be found in the live-helper(7) manpage."
-	exit 0
-fi
diff --git a/scripts/build/local b/scripts/build/local
index 7ede8be7b..9e90a000c 100755
--- a/scripts/build/local
+++ b/scripts/build/local
@@ -8,7 +8,7 @@
 ## under certain conditions; see COPYING for details.
 
 
-LH_BASE="${PWD}/live-helper"
+LH_BASE="${PWD}/live-build"
 PATH="${LH_BASE}/helpers:${PATH}"
 
 export LH_BASE PATH
diff --git a/scripts/build/source_debian-live b/scripts/build/source_debian-live
index 92f364a72..7a0d8f26d 100755
--- a/scripts/build/source_debian-live
+++ b/scripts/build/source_debian-live
@@ -29,7 +29,7 @@ then
 	exit 0
 fi
 
-Echo_message "Begin copying live-helper configuration..."
+Echo_message "Begin copying live-build configuration..."
 
 # Requiring stage file
 Require_stagefile .stage/config .stage/bootstrap