From 320b1ce75e04541613f5e5e70271be6d41bb7c79 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Wed, 29 Apr 2015 08:12:46 +0200
Subject: Flattening frontend directory within the source tree.

---
 frontend/cli/lb         | 90 -------------------------------------------------
 frontend/cli/live-build | 37 --------------------
 frontend/lb             | 90 +++++++++++++++++++++++++++++++++++++++++++++++++
 frontend/live-build     | 37 ++++++++++++++++++++
 4 files changed, 127 insertions(+), 127 deletions(-)
 delete mode 100755 frontend/cli/lb
 delete mode 100755 frontend/cli/live-build
 create mode 100755 frontend/lb
 create mode 100755 frontend/live-build

(limited to 'frontend')

diff --git a/frontend/cli/lb b/frontend/cli/lb
deleted file mode 100755
index 03ab043d3..000000000
--- a/frontend/cli/lb
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2015 Daniel Baumann <mail@daniel-baumann.ch>
-##
-## This program 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
-[ -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')"
-HELP="FIXME"
-USAGE="FIXME"
-
-case "${1}" in
-	-h|--help)
-		if [ -x "$(which man 2>/dev/null)" ]
-		then
-			man lb
-			exit 0
-		else
-			${0} --usage
-			exit 0
-		fi
-		;;
-
-	""|-u|--usage)
-		Usage
-		;;
-
-	-v|--version)
-		echo "${VERSION}"
-		exit 0
-		;;
-
-	*)
-		COMMAND="${1}"
-		shift
-
-		ENV=""
-
-		if [ "${COMMAND}" != "config" ]
-		then
-			# Checking user account
-			if [ "$(id -u)" -ne "0" ]
-			then
-				Echo_error "need root privileges"
-				exit 1
-			fi
-		fi
-
-		for _FILE in config/environment config/environment.binary
-		do
-			if [ -e "${_FILE}" ]
-			then
-				ENV="${ENV} $(grep -v '^#' ${_FILE})"
-			fi
-		done
-
-		if [ -x "${LIVE_BUILD}/scripts/build/${COMMAND}" ]
-		then
-			# User has live-build copied locally in the system
-			SCRIPT="${LIVE_BUILD}/scripts/build/${COMMAND}"
-		elif [ -x "local/live-build/scripts/build/${COMMAND}" ]
-		then
-			# User has live-build copied locally in the config
-			SCRIPT="local/live-build/scripts/build/${COMMAND}"
-		elif [ -x /usr/lib/live/build/${COMMAND} ]
-		then
-			# User has live-build installed in the system
-			SCRIPT=/usr/lib/live/build/"${COMMAND}"
-		elif [ -x "$(which ${COMMAND} 2>/dev/null)" ]
-		then
-			# User has live-build commands in path
-			SCRIPT="${COMMAND}"
-		else
-			Echo_error "no such script: ${COMMAND}"
-			exit 1
-		fi
-
-		Echo "[%s] %s" "$(date +'%F %T')" "lb ${COMMAND} $(echo ${@})"
-		${ENV} exec "${SCRIPT}" "${@}"
-		;;
-esac
diff --git a/frontend/cli/live-build b/frontend/cli/live-build
deleted file mode 100755
index 52b843730..000000000
--- a/frontend/cli/live-build
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2015 Daniel Baumann <mail@daniel-baumann.ch>
-##
-## 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/>.
-##
-## The complete text of the GNU General Public License
-## can be found in /usr/share/common-licenses/GPL-3 file.
-
-
-set -e
-
-if [ -x "$(which man 2>/dev/null)" ]
-then
-	man live-build
-else
-
-cat << EOF
-live-build contains the scripts to build a live system from a configuration
-directory.
-
-An introduction to live-build can be found in the live-build(7) manpage.
-EOF
-
-fi
diff --git a/frontend/lb b/frontend/lb
new file mode 100755
index 000000000..03ab043d3
--- /dev/null
+++ b/frontend/lb
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2015 Daniel Baumann <mail@daniel-baumann.ch>
+##
+## This program 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
+[ -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')"
+HELP="FIXME"
+USAGE="FIXME"
+
+case "${1}" in
+	-h|--help)
+		if [ -x "$(which man 2>/dev/null)" ]
+		then
+			man lb
+			exit 0
+		else
+			${0} --usage
+			exit 0
+		fi
+		;;
+
+	""|-u|--usage)
+		Usage
+		;;
+
+	-v|--version)
+		echo "${VERSION}"
+		exit 0
+		;;
+
+	*)
+		COMMAND="${1}"
+		shift
+
+		ENV=""
+
+		if [ "${COMMAND}" != "config" ]
+		then
+			# Checking user account
+			if [ "$(id -u)" -ne "0" ]
+			then
+				Echo_error "need root privileges"
+				exit 1
+			fi
+		fi
+
+		for _FILE in config/environment config/environment.binary
+		do
+			if [ -e "${_FILE}" ]
+			then
+				ENV="${ENV} $(grep -v '^#' ${_FILE})"
+			fi
+		done
+
+		if [ -x "${LIVE_BUILD}/scripts/build/${COMMAND}" ]
+		then
+			# User has live-build copied locally in the system
+			SCRIPT="${LIVE_BUILD}/scripts/build/${COMMAND}"
+		elif [ -x "local/live-build/scripts/build/${COMMAND}" ]
+		then
+			# User has live-build copied locally in the config
+			SCRIPT="local/live-build/scripts/build/${COMMAND}"
+		elif [ -x /usr/lib/live/build/${COMMAND} ]
+		then
+			# User has live-build installed in the system
+			SCRIPT=/usr/lib/live/build/"${COMMAND}"
+		elif [ -x "$(which ${COMMAND} 2>/dev/null)" ]
+		then
+			# User has live-build commands in path
+			SCRIPT="${COMMAND}"
+		else
+			Echo_error "no such script: ${COMMAND}"
+			exit 1
+		fi
+
+		Echo "[%s] %s" "$(date +'%F %T')" "lb ${COMMAND} $(echo ${@})"
+		${ENV} exec "${SCRIPT}" "${@}"
+		;;
+esac
diff --git a/frontend/live-build b/frontend/live-build
new file mode 100755
index 000000000..52b843730
--- /dev/null
+++ b/frontend/live-build
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2015 Daniel Baumann <mail@daniel-baumann.ch>
+##
+## 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/>.
+##
+## The complete text of the GNU General Public License
+## can be found in /usr/share/common-licenses/GPL-3 file.
+
+
+set -e
+
+if [ -x "$(which man 2>/dev/null)" ]
+then
+	man live-build
+else
+
+cat << EOF
+live-build contains the scripts to build a live system from a configuration
+directory.
+
+An introduction to live-build can be found in the live-build(7) manpage.
+EOF
+
+fi
-- 
cgit v1.2.3