diff options
| -rwxr-xr-x | functions/arguments.sh | 4 | ||||
| -rwxr-xr-x | functions/version.sh | 37 | ||||
| -rwxr-xr-x | scripts/build/lb | 3 | ||||
| -rwxr-xr-x | scripts/build/lb_clean | 3 | ||||
| -rwxr-xr-x | scripts/build/lb_config | 9 |
5 files changed, 8 insertions, 48 deletions
diff --git a/functions/arguments.sh b/functions/arguments.sh index d24590394..2e6c2b883 100755 --- a/functions/arguments.sh +++ b/functions/arguments.sh @@ -64,8 +64,8 @@ Arguments () ;; -v|--version) - Version - shift + echo "${VERSION}" + exit 0 ;; --) diff --git a/functions/version.sh b/functions/version.sh deleted file mode 100755 index 9ca877e7a..000000000 --- a/functions/version.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 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. - - -Version () -{ - Echo "%s, version %s" "${PROGRAM}" "${VERSION}" - Echo "This program is a part of %s" "${PACKAGE}" - echo - Echo "Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>" - echo - Echo "This program is free software: you can redistribute it and/or modify" - Echo "it under the terms of the GNU General Public License as published by" - Echo "the Free Software Foundation, either version 3 of the License, or" - Echo "(at your option) any later version." - echo - Echo "This program is distributed in the hope that it will be useful," - Echo "but WITHOUT ANY WARRANTY; without even the implied warranty of" - Echo "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the" - Echo "GNU General Public License for more details." - echo - Echo "You should have received a copy of the GNU General Public License" - Echo "along with this program. If not, see <http://www.gnu.org/licenses/>." - echo - Echo "The complete text of the GNU General Public License" - Echo "can be found in /usr/share/common-licenses/GPL-3 file." - echo - Echo "Homepage: <http://live.debian.net/>" - - exit 0 -} diff --git a/scripts/build/lb b/scripts/build/lb index 714347132..2f2320308 100755 --- a/scripts/build/lb +++ b/scripts/build/lb @@ -35,7 +35,8 @@ case "${1}" in ;; -v|--version) - Version + echo "${VERSION}" + exit 0 ;; *) diff --git a/scripts/build/lb_clean b/scripts/build/lb_clean index 417ce4f04..7f5a07bc4 100755 --- a/scripts/build/lb_clean +++ b/scripts/build/lb_clean @@ -148,7 +148,8 @@ do ;; -v|--version) - Version + echo "${VERSION}" + exit 0 ;; *) diff --git a/scripts/build/lb_config b/scripts/build/lb_config index b185c03ef..f9bd370c2 100755 --- a/scripts/build/lb_config +++ b/scripts/build/lb_config @@ -384,11 +384,6 @@ Local_arguments () shift 2 ;; - -v|--version) - Version - shift - ;; - # config/bootstrap -a|--architectures) LB_ARCHITECTURES="${2}" @@ -869,8 +864,8 @@ Local_arguments () ;; -v|--version) - Version - shift + echo "${VERSION}" + exit 0 ;; --) |