Skip to content
This repository was archived by the owner on May 10, 2024. It is now read-only.

PARQUET-562: Simplified ZSH support in build scripts #78

Closed
xhochy wants to merge 2 commits into from
Closed

PARQUET-562: Simplified ZSH support in build scripts #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e78cbcf
PARQUET-562: Simplified ZSH support in build scripts
xhochy Mar 13, 2016
916da60
Remove duplicated dirname
xhochy Mar 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions setup_build_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
: ${BUILD_DIR:=$SOURCE_DIR/build}

# Create an isolated thirdparty
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/build_thirdparty.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/download_thirdparty.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 1 addition & 5 deletions thirdparty/set_thirdparty_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down