From e78cbcf53455f643c494f13707feb90a20c3fd17 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <uwelk@xhochy.com>
Date: Sun, 13 Mar 2016 12:28:02 +0100
Subject: [PATCH 1/2] PARQUET-562: Simplified ZSH support in build scripts

The original proposed patch can be implemented in a much simpler way.
The complicated approach is only needed when used inside a function.

Also some scripts in thirdparty did not support zsh which this patch
adds.
---
 setup_build_env.sh                | 6 +-----
 thirdparty/build_thirdparty.sh    | 2 +-
 thirdparty/download_thirdparty.sh | 2 +-
 thirdparty/set_thirdparty_env.sh  | 6 +-----
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/setup_build_env.sh b/setup_build_env.sh
index c9939631..c1bea0e8 100755
--- a/setup_build_env.sh
+++ b/setup_build_env.sh
@@ -1,10 +1,6 @@
 #!/usr/bin/env bash
 
-if [ -n "${BASH_VERSION}" ]; then
-    SOURCE_DIR=$(cd "$(dirname "$BASH_SOURCE")"; pwd)
-elif [ -n "${ZSH_VERSION}" ]; then
-    SOURCE_DIR=$(cd "$(dirname "${(%):-%N}")"; pwd)
-fi
+SOURCE_DIR=$(cd "$(dirname "$(dirname "${BASH_SOURCE:-$0}")")"; pwd)
 : ${BUILD_DIR:=$SOURCE_DIR/build}
 
 # Create an isolated thirdparty
diff --git a/thirdparty/build_thirdparty.sh b/thirdparty/build_thirdparty.sh
index 32149cee..5f00055a 100755
--- a/thirdparty/build_thirdparty.sh
+++ b/thirdparty/build_thirdparty.sh
@@ -2,7 +2,7 @@
 
 set -x
 set -e
-TP_DIR=$(cd "$(dirname "$BASH_SOURCE")"; pwd)
+TP_DIR=$(cd "$(dirname "${BASH_SOURCE:-$0}")"; pwd)
 
 source $TP_DIR/versions.sh
 PREFIX=$TP_DIR/installed
diff --git a/thirdparty/download_thirdparty.sh b/thirdparty/download_thirdparty.sh
index c01c9b27..1ea2eba5 100755
--- a/thirdparty/download_thirdparty.sh
+++ b/thirdparty/download_thirdparty.sh
@@ -3,7 +3,7 @@
 set -x
 set -e
 
-TP_DIR=$(cd "$(dirname "$BASH_SOURCE")"; pwd)
+TP_DIR=$(cd "$(dirname "${BASH_SOURCE:-$0}")"; pwd)
 
 source $TP_DIR/versions.sh
 
diff --git a/thirdparty/set_thirdparty_env.sh b/thirdparty/set_thirdparty_env.sh
index cf16193f..72b7074b 100644
--- a/thirdparty/set_thirdparty_env.sh
+++ b/thirdparty/set_thirdparty_env.sh
@@ -1,10 +1,6 @@
 #!/usr/bin/env bash
 
-if [ -n "${BASH_VERSION}" ]; then
-    SOURCE_DIR=$(cd "$(dirname "$BASH_SOURCE")"; pwd)
-elif [ -n "${ZSH_VERSION}" ]; then
-    SOURCE_DIR=$(cd "$(dirname "${(%):-%N}")"; pwd)
-fi
+SOURCE_DIR=$(cd "$(dirname "${BASH_SOURCE:-$0}")"; pwd)
 source $SOURCE_DIR/versions.sh
 
 if [ -z "$THIRDPARTY_DIR" ]; then

From 916da60e0fdc3ba436111a7b757e8d9f0d79c0d4 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <uwelk@xhochy.com>
Date: Sun, 13 Mar 2016 12:36:36 +0100
Subject: [PATCH 2/2] Remove duplicated dirname

---
 setup_build_env.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup_build_env.sh b/setup_build_env.sh
index c1bea0e8..37b702fc 100755
--- a/setup_build_env.sh
+++ b/setup_build_env.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-SOURCE_DIR=$(cd "$(dirname "$(dirname "${BASH_SOURCE:-$0}")")"; pwd)
+SOURCE_DIR=$(cd "$(dirname "${BASH_SOURCE:-$0}")"; pwd)
 : ${BUILD_DIR:=$SOURCE_DIR/build}
 
 # Create an isolated thirdparty