[SCM] Debian Live build scripts branch, master, updated. 1.0.2-4-43-g699131f

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 699131f487ffad23eebe15088776b5259b505e0c
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Jan 30 21:24:01 2009 +0100

    Adding dummy live-helper command to make any confused user aware that live-helper is a set of commands starting with the lh_ prefix.

diff --git a/Makefile b/Makefile
index 8465ed2..75d2bbb 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ build:
 install:
 	# Installing executables
 	mkdir -p $(DESTDIR)/usr/bin
-	cp helpers/lh* $(DESTDIR)/usr/bin
+	cp helpers/* $(DESTDIR)/usr/bin
 
 	# Installing shared data
 	mkdir -p $(DESTDIR)/usr/share/live-helper
diff --git a/helpers/lh b/helpers/lh
index 7b27c2d..70dc6b9 100755
--- a/helpers/lh
+++ b/helpers/lh
@@ -1,23 +1,11 @@
 #!/bin/sh
 
-# live-helper(7) - utility to build Debian Live systems
+# lh(1) - generic live-helper wrapper
 # Copyright (C) 2006-2009 Daniel Baumann <daniel at 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.
+# live-helper 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
 
diff --git a/helpers/lh b/helpers/live-helper
similarity index 66%
copy from helpers/lh
copy to helpers/live-helper
index 7b27c2d..e4ce2be 100755
--- a/helpers/lh
+++ b/helpers/live-helper
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# live-helper(7) - utility to build Debian Live systems
+# live-helper(7) - the Debian Live tool suite
 # Copyright (C) 2006-2009 Daniel Baumann <daniel at debian.org>
 #
 # This program is free software: you can redistribute it and/or modify
@@ -24,34 +24,15 @@ set -e
 # Including common functions
 . "${LH_BASE:-/usr/share/live-helper}"/functions.sh
 
-# Setting static variables
-DESCRIPTION="$(Echo 'utility to build Debian Live systems')"
-HELP="FIXME"
-USAGE="FIXME"
-
-case "${1}" in
-	-h|--help)
-		Man
-		;;
-
-	-u|--usage)
-		Usage
-		;;
-
-	-v|--version)
-		Version
-		;;
-
-	*)
-		COMMAND="${1}"
-		shift
-
-		if [ -x "$(which lh_${COMMAND} 2>/dev/null)" ]
-		then
-			exec lh_"${COMMAND}" ${@}
-		else
-			Echo_error "no such helper"
-			exit 1
-		fi
-		;;
-esac
+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

-- 
Debian Live build scripts