Replace GNU-only readlink -f with a BSD/OSX-friendly alternative.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/a215b46d Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/a215b46d Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/a215b46d Branch: refs/heads/develop Commit: a215b46de525e31a46a28bf411e13af79abcde3e Parents: ec2e3be Author: Philip Kovac <philip.ko...@iweave.com> Authored: Wed Jul 20 14:25:33 2016 -0400 Committer: Philip Kovac <philip.ko...@iweave.com> Committed: Wed Jul 20 14:25:33 2016 -0400 ---------------------------------------------------------------------- npm-flexjs/js/bin/asjscnpm | 6 ++++-- npm-flexjs/js/bin/asjscompcnpm | 6 ++++-- npm-flexjs/js/bin/mxmlcnpm | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/a215b46d/npm-flexjs/js/bin/asjscnpm ---------------------------------------------------------------------- diff --git a/npm-flexjs/js/bin/asjscnpm b/npm-flexjs/js/bin/asjscnpm index d4c99d6..cc7570f 100755 --- a/npm-flexjs/js/bin/asjscnpm +++ b/npm-flexjs/js/bin/asjscnpm @@ -25,8 +25,10 @@ # In Windows Command Prompt, use mxmlc.bat instead. # -SCRIPT_REAL_PATH=`readlink -f "$0"` -SCRIPT_HOME=`dirname "$SCRIPT_REAL_PATH"` +function abspath() { pushd . > /dev/null; if [ -d "$1" ]; then cd "$1"; dirs -l +0; else cd "`dirname \"$1\"`"; cur_dir=`dirs -l +0`; if [ "$cur_dir" == "/" ]; then echo "$cur_dir`basename \"$1\"`"; else echo "$cur_dir/`basename \"$1\"`"; fi; fi; popd > /dev/null; } +SCRIPT_REAL_FILE=`readlink "$0" || echo "$0"`; +SCRIPT_ABS_PATH=`abspath "$SCRIPT_REAL_FILE"` +SCRIPT_HOME=`dirname "$SCRIPT_ABS_PATH"` FALCON_HOME=${SCRIPT_HOME}/../.. FLEX_HOME=${SCRIPT_HOME}/../.. http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/a215b46d/npm-flexjs/js/bin/asjscompcnpm ---------------------------------------------------------------------- diff --git a/npm-flexjs/js/bin/asjscompcnpm b/npm-flexjs/js/bin/asjscompcnpm index 3b2a3de..0435aac 100755 --- a/npm-flexjs/js/bin/asjscompcnpm +++ b/npm-flexjs/js/bin/asjscompcnpm @@ -25,8 +25,10 @@ # In Windows Command Prompt, use mxmlc.bat instead. # -SCRIPT_REAL_PATH=`readlink -f "$0"` -SCRIPT_HOME=`dirname "$SCRIPT_REAL_PATH"` +function abspath() { pushd . > /dev/null; if [ -d "$1" ]; then cd "$1"; dirs -l +0; else cd "`dirname \"$1\"`"; cur_dir=`dirs -l +0`; if [ "$cur_dir" == "/" ]; then echo "$cur_dir`basename \"$1\"`"; else echo "$cur_dir/`basename \"$1\"`"; fi; fi; popd > /dev/null; } +SCRIPT_REAL_FILE=`readlink "$0" || echo "$0"`; +SCRIPT_ABS_PATH=`abspath "$SCRIPT_REAL_FILE"` +SCRIPT_HOME=`dirname "$SCRIPT_ABS_PATH"` FALCON_HOME=${SCRIPT_HOME}/../.. FLEX_HOME=${SCRIPT_HOME}/../.. http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/a215b46d/npm-flexjs/js/bin/mxmlcnpm ---------------------------------------------------------------------- diff --git a/npm-flexjs/js/bin/mxmlcnpm b/npm-flexjs/js/bin/mxmlcnpm index 5ef12d7..1546763 100755 --- a/npm-flexjs/js/bin/mxmlcnpm +++ b/npm-flexjs/js/bin/mxmlcnpm @@ -25,8 +25,10 @@ # In Windows Command Prompt, use mxmlc.bat instead. # -SCRIPT_REAL_PATH=`readlink -f "$0"` -SCRIPT_HOME=`dirname "$SCRIPT_REAL_PATH"` +function abspath() { pushd . > /dev/null; if [ -d "$1" ]; then cd "$1"; dirs -l +0; else cd "`dirname \"$1\"`"; cur_dir=`dirs -l +0`; if [ "$cur_dir" == "/" ]; then echo "$cur_dir`basename \"$1\"`"; else echo "$cur_dir/`basename \"$1\"`"; fi; fi; popd > /dev/null; } +SCRIPT_REAL_FILE=`readlink "$0" || echo "$0"`; +SCRIPT_ABS_PATH=`abspath "$SCRIPT_REAL_FILE"` +SCRIPT_HOME=`dirname "$SCRIPT_ABS_PATH"` if [ "x${FALCON_HOME}" = "x" ] then FALCON_HOME=${SCRIPT_HOME}/../..
