Skip to content

allow symlinking to shell scripts #2386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

allow symlinking to shell scripts #2386

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbee6c1
allow symlinking to shell scripts
hsn10 Sep 14, 2014
472abb6
allow linking from directories with space inside
hsn10 Sep 15, 2014
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
2 changes: 1 addition & 1 deletion bin/beeline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
set -o posix

# Figure out where Spark is installed
FWDIR="$(cd "`dirname "$0"`"/..; pwd)"
FWDIR="$(cd $(dirname $(readlink -f $0))/..; pwd)"

CLASS="org.apache.hive.beeline.BeeLine"
exec "$FWDIR/bin/spark-class" $CLASS "$@"
2 changes: 1 addition & 1 deletion bin/pyspark
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#

# Figure out where Spark is installed
FWDIR="$(cd "`dirname "$0"`"/..; pwd)"
FWDIR="$(cd $(dirname $(readlink -f $0))/..; pwd)"

# Export this as SPARK_HOME
export SPARK_HOME="$FWDIR"
Expand Down
2 changes: 1 addition & 1 deletion bin/run-example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

SCALA_VERSION=2.10

FWDIR="$(cd "`dirname "$0"`"/..; pwd)"
FWDIR="$(cd $(dirname $(readlink -f $0))/..; pwd)"
export SPARK_HOME="$FWDIR"
EXAMPLES_DIR="$FWDIR"/examples

Expand Down
2 changes: 1 addition & 1 deletion bin/spark-class
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ esac
SCALA_VERSION=2.10

# Figure out where Spark is installed
FWDIR="$(cd "`dirname "$0"`"/..; pwd)"
FWDIR="$(cd $(dirname $(readlink -f $0))/..; pwd)"

# Export this as SPARK_HOME
export SPARK_HOME="$FWDIR"
Expand Down
2 changes: 1 addition & 1 deletion bin/spark-shell
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ esac
set -o posix

## Global script variables
FWDIR="$(cd "`dirname "$0"`"/..; pwd)"
FWDIR="$(cd $(dirname $(readlink -f $0))/..; pwd)"
Copy link
Member

@ScrapCodes ScrapCodes Sep 15, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You may have to quote these - so that dirs with spaces within their name work. Like they do at the moment.
Above should look like.
FWDIR="$(cd "$(dirname "$(readlink -f "$0")")"/..; pwd)"

Copy link
Member

@ScrapCodes ScrapCodes Sep 15, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ofcourse this applies to all other places as well.


function usage() {
echo "Usage: ./bin/spark-shell [options]"
Expand Down
2 changes: 1 addition & 1 deletion bin/spark-sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ CLASS="org.apache.spark.sql.hive.thriftserver.SparkSQLCLIDriver"
CLASS_NOT_FOUND_EXIT_STATUS=1

# Figure out where Spark is installed
FWDIR="$(cd "`dirname "$0"`"/..; pwd)"
FWDIR="$(cd $(dirname $(readlink -f $0))/..; pwd)"

function usage {
echo "Usage: ./bin/spark-sql [options] [cli option]"
Expand Down
2 changes: 1 addition & 1 deletion bin/spark-submit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

# NOTE: Any changes in this file must be reflected in SparkSubmitDriverBootstrapper.scala!

export SPARK_HOME="$(cd "`dirname "$0"`"/..; pwd)"
export SPARK_HOME="$(cd $(dirname $(readlink -f $0))/..; pwd)"
ORIG_ARGS=("$@")

while (($#)); do
Expand Down