Merging lh_dumpconfig into lh_config as --dump parameter.

2 files changed, 32 insertions, 60 deletions

diff --git a/helpers/lh_config b/helpers/lh_config
index 4ac6353f0..fd1b10518 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -151,6 +151,38 @@ Local_arguments ()
 	while true
 	do
 		case "${1}" in
+			--dump)
+				# Dump version
+				echo "${0}: This is live-helper version ${VERSION}"
+				dpkg -l live-helper || true
+
+				# Dump conffile contents
+				Print_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+
+				# Dump contents of directories that contain text files
+				for DIRECTORY in config/binary_local-packageslists config/chroot_local-packageslists config/chroot_apt config/chroot_local-patches config/chroot_local-preseed config/binary_rootfs
+				do
+					if Find_files "${DIRECTORY}"
+					then
+						Echo_file "${DIRECTORY}"/*
+					fi
+				done
+
+				# Dump directory listings of all directories under config/
+				for DIRECTORY in $(find config/ -type d -mindepth 1 -maxdepth 1)
+				do
+					if Find_files "${DIRECTORY}"
+					then
+						ls -lR "${DIRECTORY}" | while read LINE
+						do
+							echo "${DIRECTORY}: ${LINE}"
+						done
+					fi
+				done
+
+				exit 0
+				;;
+
 			# config/common
 			--apt)
 				LH_APT="${2}"
diff --git a/helpers/lh_dumpconfig b/helpers/lh_dumpconfig
deleted file mode 100755
index c5509ee65..000000000
--- a/helpers/lh_dumpconfig
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-# lh_dumpconfig(1) - dump build configuration for remote debugging
-# Copyright (C) 2006-2008 Daniel Baumann <daniel@debian.org>
-#
-# 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
-
-# Including common functions
-LH_BASE="${LH_BASE:-/usr/share/live-helper}"
-
-for FUNCTION in "${LH_BASE}"/functions/*.sh
-do
-	. "${FUNCTION}"
-done
-
-# Setting static variables
-DESCRIPTION="dump build configuration"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# Checking defaults
-Check_defaults
-
-# Dump version
-echo "${0}: This is live-helper version ${VERSION}"
-dpkg -l live-helper || true
-
-# Dump conffile contents
-Print_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-
-# Dump contents of directories that contain text files
-for DIRECTORY in config/binary_local-packageslists config/chroot_local-packageslists config/chroot_apt config/chroot_local-patches config/chroot_local-preseed config/binary_rootfs
-do
-	if Find_files "${DIRECTORY}"
-	then
-		Echo_file "${DIRECTORY}"/*
-	fi
-done
-
-# Dump directory listings of all directories under config/
-for DIRECTORY in $(find config/ -type d -mindepth 1 -maxdepth 1)
-do
-	if Find_files "${DIRECTORY}"
-	then
-		ls -lR "${DIRECTORY}" | while read LINE
-		do
-			echo "${DIRECTORY}: ${LINE}"
-		done
-	fi
-done