[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=90f67b8

The following commit has been merged in the master branch:
commit 90f67b87251c472e0fac709c843d241a1b2464d0
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Sep 25 17:16:36 2016 +0000

    #1230 Buildserver maintenance.
---
 contrib/buildserver/buildserver.library | 25 +++++++++++--------------
 contrib/buildserver/dailyCMake.sh       |  2 +-
 contrib/buildserver/dailyTest.sh        |  4 ++--
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/contrib/buildserver/buildserver.library b/contrib/buildserver/buildserver.library
index 6cd60c8..7f11ceb 100644
--- a/contrib/buildserver/buildserver.library
+++ b/contrib/buildserver/buildserver.library
@@ -1,5 +1,5 @@
 ##
-# functions.so - source this from scripts
+# buildserver.library - source this from scripts
 ##
 
 result=0
@@ -9,14 +9,14 @@ if [ -z "$DAILY"   ]; then export DAILY=userContent/builds/Daily       ; fi
 ##
 # osName - print 'macosx' or 'cygwin' or 'mingw' or 'linux'
 osName () {
-    if   [ $(uname)   == Darwin  ]; then
-        echo macosx
-    elif [ $(uname -o) == Cygwin ]; then
-        echo cygwin
-    elif [ $(uname -o) == Msys   ]; then
-        echo mingw
+    if   [ "$(uname)"    == Darwin ]; then
+      echo macosx
+    elif [ "$(uname -o)" == Cygwin ]; then
+      echo cygwin
+    elif [ "$(uname -o)" == Msys   ]; then
+      echo mingw
     else
-        echo linux
+      echo linux
     fi
 }
 
@@ -24,15 +24,15 @@ osName () {
 # which PLATFORM
 # PLATFORM must be defined as msvc or ming when called from ssh
 if [ "$PLATFORM" == "" ]; then
-    export PLATFORM=$(echo osName)
-    if ( "$PLATFORM" == "cygwin" ]; then
+    export PLATFORM="$(echo osName)"
+    if [ "$PLATFORM" == "cygwin" ]; then
         # tweak path to ensure the correct version of perl and expr for autotools
         export "PATH=/bin:$PATH"
     fi
 fi
 
 ##
-# functions
+# thePath - echo full path to file
 thepath () {
     if [ -d $1 ]; then
         ( cd $1;
@@ -43,8 +43,5 @@ thepath () {
     fi
 }
 
-
 # That's all Folks!
 ##
-
-
diff --git a/contrib/buildserver/dailyCMake.sh b/contrib/buildserver/dailyCMake.sh
index bbef143..a254183 100755
--- a/contrib/buildserver/dailyCMake.sh
+++ b/contrib/buildserver/dailyCMake.sh
@@ -218,7 +218,7 @@ testBuild()
 ) | tr -d $'
' | tee "$build/dist/logs/build.log"
 
 # exit if are in mingw and leave cygwin to package the build
-if [ $(osName) == "mingw" ]; then echo "goodbye from mingw" ; exit 0; fi
+if [ "$(osName)" == "mingw" ]; then echo "goodbye from mingw" ; exit 0; fi
 
 ##
 # store the build for users to collect
diff --git a/contrib/buildserver/dailyTest.sh b/contrib/buildserver/dailyTest.sh
index 009a2be..6b98318 100755
--- a/contrib/buildserver/dailyTest.sh
+++ b/contrib/buildserver/dailyTest.sh
@@ -4,10 +4,10 @@ source $(find . -name buildserver.library 2>/dev/null)
 
 echo -------------------------------
 echo PLATFORM = $PLATFORM PWD = $PWD
-if [ $(osName) == "mingw" ]; then
+if [ "$(osName)" == "mingw" ]; then
     echo "Windows directory (mingw) = " $(pwd -W)
 fi
-if [ $(osName) == "cygwin" ]; then
+if [ "$(osName)" == "cygwin" ]; then
     echo "Windows directory (cygwin) = " $(cygpath -aw .)
 fi
 echo -------------------------------

-- 
exiv2 packaging