[Debian-live-changes] r967 - in dists/trunk/live-helper: functions
helpers
Daniel Baumann
daniel at alioth.debian.org
Fri Apr 6 12:58:44 UTC 2007
Author: daniel
Date: 2007-04-06 12:58:44 +0000 (Fri, 06 Apr 2007)
New Revision: 967
Modified:
dists/trunk/live-helper/functions/arguments.sh
dists/trunk/live-helper/functions/breakpoints.sh
dists/trunk/live-helper/functions/defaults.sh
dists/trunk/live-helper/functions/echo.sh
dists/trunk/live-helper/functions/stagefile.sh
dists/trunk/live-helper/helpers/make-live
Log:
Modified: dists/trunk/live-helper/functions/arguments.sh
===================================================================
--- dists/trunk/live-helper/functions/arguments.sh 2007-04-06 12:48:39 UTC (rev 966)
+++ dists/trunk/live-helper/functions/arguments.sh 2007-04-06 12:58:44 UTC (rev 967)
@@ -25,7 +25,7 @@
do
case "${1}" in
--breakpoints)
- LH_BREAKPOINTS="true"; shift
+ LH_BREAKPOINTS="enabled"; shift
;;
--conffile)
@@ -33,11 +33,11 @@
;;
--debug)
- LH_DEBUG="true"; shift
+ LH_DEBUG="enabled"; shift
;;
--force)
- LH_FORCE="true"; shift
+ LH_FORCE="enabled"; shift
;;
-h|--help)
@@ -49,7 +49,7 @@
;;
--quiet)
- LH_QUIET="true"; shift
+ LH_QUIET="enabled"; shift
;;
-u|--usage)
@@ -57,7 +57,7 @@
;;
--verbose)
- LH_VERBOSE="true"; shift
+ LH_VERBOSE="enabled"; shift
;;
-v|--version)
Modified: dists/trunk/live-helper/functions/breakpoints.sh
===================================================================
--- dists/trunk/live-helper/functions/breakpoints.sh 2007-04-06 12:48:39 UTC (rev 966)
+++ dists/trunk/live-helper/functions/breakpoints.sh 2007-04-06 12:58:44 UTC (rev 967)
@@ -9,10 +9,11 @@
Breakpoint ()
{
- BREAKPOINT="${1}"
+ if [ "${LH_BREAKPOINTS}" = "enabled" ]
+ then
+ BREAKPOINT="${1}"
- Echo_message "Stopping at ${BREAKPOINT}"
- Echo_message "Press enter to continue..."
-
- read
+ Echo_message "Waiting at ${BREAKPOINT}"
+ read
+ fi
}
Modified: dists/trunk/live-helper/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh 2007-04-06 12:48:39 UTC (rev 966)
+++ dists/trunk/live-helper/functions/defaults.sh 2007-04-06 12:58:44 UTC (rev 967)
@@ -127,27 +127,27 @@
# Setting live helper options
if [ -z "${LH_BREAKPOINTS}" ]
then
- LH_BREAKPOINTS="false"
+ LH_BREAKPOINTS="disabled"
fi
if [ -z "${LH_DEBUG}" ]
then
- LH_DEBUG="false"
+ LH_DEBUG="disabled"
fi
if [ -z "${LH_FORCE}" ]
then
- LH_FORCE="false"
+ LH_FORCE="disabled"
fi
if [ -z "${LH_QUIET}" ]
then
- LH_QUIET="false"
+ LH_QUIET="disabled"
fi
if [ -z "${LH_VERBOSE}" ]
then
- LH_VERBOSE="false"
+ LH_VERBOSE="disabled"
fi
## config/bootstrap
Modified: dists/trunk/live-helper/functions/echo.sh
===================================================================
--- dists/trunk/live-helper/functions/echo.sh 2007-04-06 12:48:39 UTC (rev 966)
+++ dists/trunk/live-helper/functions/echo.sh 2007-04-06 12:58:44 UTC (rev 967)
@@ -11,7 +11,7 @@
Echo_debug ()
{
- if [ "${LH_DEBUG}" = "true" ]
+ if [ "${LH_DEBUG}" = "enabled" ]
then
echo "D: ${@}"
fi
@@ -24,7 +24,7 @@
Echo_message ()
{
- if [ "${LH_QUIET}" != "true" ]
+ if [ "${LH_QUIET}" != "enabled" ]
then
echo "P: ${@}"
fi
@@ -32,7 +32,7 @@
Echo_verbose ()
{
- if [ "${LH_VERBOSE}" = "true" ]
+ if [ "${LH_VERBOSE}" = "enabled" ]
then
echo "I: ${@}"
fi
Modified: dists/trunk/live-helper/functions/stagefile.sh
===================================================================
--- dists/trunk/live-helper/functions/stagefile.sh 2007-04-06 12:48:39 UTC (rev 966)
+++ dists/trunk/live-helper/functions/stagefile.sh 2007-04-06 12:58:44 UTC (rev 967)
@@ -17,7 +17,7 @@
# Checking stage file
if [ -f "${FILE}" ]
then
- if [ "${LH_FORCE}" = "true" ]
+ if [ "${LH_FORCE}" = "enabled" ]
then
# Forcing execution
rm -f "${FILE}"
Modified: dists/trunk/live-helper/helpers/make-live
===================================================================
--- dists/trunk/live-helper/helpers/make-live 2007-04-06 12:48:39 UTC (rev 966)
+++ dists/trunk/live-helper/helpers/make-live 2007-04-06 12:58:44 UTC (rev 967)
@@ -274,23 +274,23 @@
;;
--breakpoints)
- LH_BREAKPOINTS="true"; shift
+ LH_BREAKPOINTS="enabled"; shift
;;
--debug)
- LH_DEBUG="true"; shift
+ LH_DEBUG="enabled"; shift
;;
--force)
- LH_FORCE="true"; shift
+ LH_FORCE="enabled"; shift
;;
--quiet)
- LH_QUIET="true"; shift
+ LH_QUIET="enabled"; shift
;;
--verbose)
- LH_VERBOSE="true"; shift
+ LH_VERBOSE="enabled"; shift
;;
--)
@@ -327,27 +327,27 @@
# Configuring (this is really shit!)
LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LH_APT_GENERIC="${LH_APT_GENERIC}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_BUILD="${LIVE_MIRROR_BUILD}" LIVE_MIRROR_BUILD_SECURITY="${LIVE_MIRROR_BUILD_SECURITY}" LIVE_MIRROR_IMAGE="${LIVE_MIRROR_IMAGE}" LIVE_MIRROR_IMAGE_SECURITY="${LIVE_MIRROR_IMAGE_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_KERNEL_FLAVOUR="${LIVE_KERNEL_FLAVOUR}" LIVE_KERNEL_PACKAGES="${LIVE_KERNEL_PACKAGES}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" LIVE_TASKS="${LIVE_TASKS}" LIVE_SECURITY="${LIVE_SECURITY}" LIVE_SYMLINKS="${LIVE_SYMLINKS}" LIVE_SYSVINIT="${LIVE_SYSVINIT}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" LIVE_ENCRYPTION="${LIVE_ENCRYPTION}" LIVE_USERNAME="${LIVE_USERNAME}" LIVE_HOSTNAME="${LIVE_HOSTNAME}" LIVE_FILESYSTEM="${LIVE_FILESYSTEM}" LIVE_MEMTEST86="${LIVE_MEMTEST86}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_SERVER_ADDRESS="${LIVE_SERVER_ADDRESS}" LIVE_SERVER_PATH="${LIVE_SERVER_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGE="${LIVE_BINARY_IMAGE}" LIVE_SOURCE_IMAGE="${LIVE_SOURCE_IMAGE}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" lh_config newconfig
- if [ "${LH_BREAKPOINTS}" = "true" ]
+ if [ "${LH_BREAKPOINTS}" = "enabled" ]
then
OPTIONS="${OPTIONS} --breakpoints"
fi
- if [ "${LH_DEBUG}" = "true" ]
+ if [ "${LH_DEBUG}" = "enabled" ]
then
OPTIONS="${OPTIONS} --debug"
fi
- if [ "${LH_FORCE}" = "true" ]
+ if [ "${LH_FORCE}" = "enabled" ]
then
OPTIONS="${OPTIONS} --force"
fi
- if [ "${LH_QUIET}" = "true" ]
+ if [ "${LH_QUIET}" = "enabled" ]
then
OPTIONS="${OPTIONS} --quiet"
fi
- if [ "${LH_VERBOSE}" = "true" ]
+ if [ "${LH_VERBOSE}" = "enabled" ]
then
OPTIONS="${OPTIONS} --verbose"
fi
More information about the Debian-live-changes
mailing list