[X2Go-Commits] [x2goclient] 06/07: macbuild.sh: move functions to the start of the macbuild.sh script.

git-admin at x2go.org git-admin at x2go.org
Wed Feb 18 03:40:38 CET 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/cleanup
in repository x2goclient.

commit a266d775091b24c045213ce3f638b6c716dc1a8b
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Feb 18 03:24:33 2015 +0100

    macbuild.sh: move functions to the start of the macbuild.sh script.
---
 debian/changelog |    1 +
 macbuild.sh      |   40 ++++++++++++++++++++--------------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 60cfbee..8d33d91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -229,6 +229,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium
       behavior according to SUS.
     - Define and implement new function 'make_boolean()' in macbuild.sh. Takes
       a pseudo-boolean value and outputs either 0 or 1. Use this function.
+    - Move functions to the start of the macbuild.sh script.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 27 Nov 2014 12:01:43 +0100
 
diff --git a/macbuild.sh b/macbuild.sh
index c5e25d5..bd35460 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -1,4 +1,24 @@
 #!/bin/bash
+
+make_boolean() {
+	OPTION="${1}"
+
+	case "${OPTION}" in
+		("0"|"no"|""|"No"|"nO"|"NO"|"false"|"FALSE") OPTION="0";;
+		(*) OPTION="1";;
+	esac
+
+	printf "${OPTION}"
+}
+
+phase() {
+	echo
+	echo "***"
+	echo "*** ${1}..."
+	echo "***"
+	echo
+}
+
 NAME="x2goclient"
 
 TOP_DIR="$(dirname "$0")"
@@ -16,18 +36,6 @@ NXPROXY="$(which nxproxy)"
 : ${DEBUG:="0"}
 : ${BUNDLE:="1"}
 
-
-make_boolean() {
-	OPTION="${1}"
-
-	case "${OPTION}" in
-		("0"|"no"|""|"No"|"nO"|"NO"|"false"|"FALSE") OPTION="0";;
-		(*) OPTION="1";;
-	esac
-
-	printf "${OPTION}"
-}
-
 DEBUG="$(make_boolean "${DEBUG}")"
 BUNDLE="$(make_boolean "${BUNDLE}")"
 
@@ -46,14 +54,6 @@ fi
 
 set -e
 
-phase() {
-	echo
-	echo "***"
-	echo "*** ${1}..."
-	echo "***"
-	echo
-}
-
 phase "Cleaning"
 make clean
 

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list