DRILL-4921: Added -P to "cd" in scripts to allow for symbolic links
close apache/drill#623 Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/de557862 Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/de557862 Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/de557862 Branch: refs/heads/master Commit: de557862d036d12b2dcedf48c30c294482b9a65d Parents: 6d2b948 Author: Boaz Ben-Zvi <[email protected]> Authored: Tue Oct 18 16:01:11 2016 -0700 Committer: Aman Sinha <[email protected]> Committed: Thu Oct 20 22:18:47 2016 -0700 ---------------------------------------------------------------------- distribution/src/resources/drill-conf | 2 +- distribution/src/resources/drill-config.sh | 2 +- distribution/src/resources/drill-embedded | 2 +- distribution/src/resources/drill-localhost | 2 +- distribution/src/resources/drillbit.sh | 2 +- distribution/src/resources/dumpcat | 2 +- distribution/src/resources/submit_plan | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/de557862/distribution/src/resources/drill-conf ---------------------------------------------------------------------- diff --git a/distribution/src/resources/drill-conf b/distribution/src/resources/drill-conf index 00e0d25..104f7ff 100755 --- a/distribution/src/resources/drill-conf +++ b/distribution/src/resources/drill-conf @@ -16,7 +16,7 @@ # limitations under the License. bin=`dirname "${BASH_SOURCE-$0}"` -bin=`cd "$bin">/dev/null; pwd` +bin=`cd -P "$bin">/dev/null; pwd` # Start sqlline session using connection settings from configuration file exec ${bin}/sqlline -u "jdbc:drill:" "$@" http://git-wip-us.apache.org/repos/asf/drill/blob/de557862/distribution/src/resources/drill-config.sh ---------------------------------------------------------------------- diff --git a/distribution/src/resources/drill-config.sh b/distribution/src/resources/drill-config.sh index 7a72e27..b36d856 100644 --- a/distribution/src/resources/drill-config.sh +++ b/distribution/src/resources/drill-config.sh @@ -66,7 +66,7 @@ done # convert relative path to absolute path bin=`dirname "$this"` script=`basename "$this"` -home=`cd "$bin/..">/dev/null; pwd` +home=`cd -P "$bin/..">/dev/null; pwd` this="$home/bin/$script" # the root of the drill installation http://git-wip-us.apache.org/repos/asf/drill/blob/de557862/distribution/src/resources/drill-embedded ---------------------------------------------------------------------- diff --git a/distribution/src/resources/drill-embedded b/distribution/src/resources/drill-embedded index 51485f8..e81f2b5 100755 --- a/distribution/src/resources/drill-embedded +++ b/distribution/src/resources/drill-embedded @@ -16,7 +16,7 @@ # limitations under the License. bin=`dirname "${BASH_SOURCE-$0}"` -bin=`cd "$bin">/dev/null; pwd` +bin=`cd -P "$bin">/dev/null; pwd` # Start a sqlline session with an embedded Drillbit export DRILL_EMBEDDED=1 http://git-wip-us.apache.org/repos/asf/drill/blob/de557862/distribution/src/resources/drill-localhost ---------------------------------------------------------------------- diff --git a/distribution/src/resources/drill-localhost b/distribution/src/resources/drill-localhost index 454045c..97add40 100755 --- a/distribution/src/resources/drill-localhost +++ b/distribution/src/resources/drill-localhost @@ -16,7 +16,7 @@ # limitations under the License. bin=`dirname "${BASH_SOURCE-$0}"` -bin=`cd "$bin">/dev/null; pwd` +bin=`cd -P "$bin">/dev/null; pwd` # Start sqlline session by connection to locally running Drillbit exec ${bin}/sqlline -u "jdbc:drill:drillbit=localhost" "$@" http://git-wip-us.apache.org/repos/asf/drill/blob/de557862/distribution/src/resources/drillbit.sh ---------------------------------------------------------------------- diff --git a/distribution/src/resources/drillbit.sh b/distribution/src/resources/drillbit.sh index 16b6e27..bba7392 100755 --- a/distribution/src/resources/drillbit.sh +++ b/distribution/src/resources/drillbit.sh @@ -59,7 +59,7 @@ usage="Usage: drillbit.sh [--config|--site <site-dir>]\ (start|stop|status|restart|run) [args]" bin=`dirname "${BASH_SOURCE-$0}"` -bin=`cd "$bin">/dev/null; pwd` +bin=`cd -P "$bin">/dev/null; pwd` base=`basename "${BASH_SOURCE-$0}"` command=${base/.*/} http://git-wip-us.apache.org/repos/asf/drill/blob/de557862/distribution/src/resources/dumpcat ---------------------------------------------------------------------- diff --git a/distribution/src/resources/dumpcat b/distribution/src/resources/dumpcat index a2ea4d3..2979b3e 100755 --- a/distribution/src/resources/dumpcat +++ b/distribution/src/resources/dumpcat @@ -16,7 +16,7 @@ # limitations under the License. bin=`dirname "${BASH_SOURCE-$0}"` -bin=`cd "$bin">/dev/null; pwd` +bin=`cd -P "$bin">/dev/null; pwd` . "$bin"/drill-config.sh http://git-wip-us.apache.org/repos/asf/drill/blob/de557862/distribution/src/resources/submit_plan ---------------------------------------------------------------------- diff --git a/distribution/src/resources/submit_plan b/distribution/src/resources/submit_plan index 0a58d8c..86434bf 100755 --- a/distribution/src/resources/submit_plan +++ b/distribution/src/resources/submit_plan @@ -16,7 +16,7 @@ # limitations under the License. bin=`dirname "${BASH_SOURCE-$0}"` -bin=`cd "$bin">/dev/null; pwd` +bin=`cd -P "$bin">/dev/null; pwd` . "$bin"/drill-config.sh
