summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/arguments.sh4
-rwxr-xr-xfunctions/version.sh37
2 files changed, 2 insertions, 39 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
-}