diff options
| author | Joan Touzet <wohali@users.noreply.github.com> | 2020-01-31 17:16:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-31 17:16:58 +0000 |
| commit | d0f0c44d059af6f42d50a5e27e3344fa2e4b94fb (patch) | |
| tree | 499a6c690835ac60749a2f81a8f7a5d820f5ee38 | |
| parent | de00ef41e28808ba83acf8244ac9301e10d89e27 (diff) | |
| parent | 6124187883922536808d09a5573c959c950e8aa3 (diff) | |
| download | couchdb-no-rc-tags.tar.gz | |
Merge branch 'master' into no-rc-tagsno-rc-tags
| -rwxr-xr-x | rel/files/couchdb.in | 10 | ||||
| -rwxr-xr-x | rel/overlay/bin/remsh | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/rel/files/couchdb.in b/rel/files/couchdb.in index 3d7ee1119..c6ee7c933 100755 --- a/rel/files/couchdb.in +++ b/rel/files/couchdb.in @@ -14,15 +14,15 @@ canonical_readlink () { - cd $(dirname $1); - FILE=$(basename $1); + FILE=$(dirname "$1")/$(basename "$1"); if [ -h "$FILE" ]; then - canonical_readlink $(readlink $FILE); + cd $(dirname "$1") + canonical_readlink $(readlink "$FILE"); else - echo "$(pwd -P)"; + cd "${1%/*}" && pwd -P; fi } -COUCHDB_BIN_DIR=$(canonical_readlink $0) +COUCHDB_BIN_DIR=$(canonical_readlink "$0") ERTS_BIN_DIR=$COUCHDB_BIN_DIR/../ cd "$COUCHDB_BIN_DIR/../" diff --git a/rel/overlay/bin/remsh b/rel/overlay/bin/remsh index b8946ace3..c5e932a8d 100755 --- a/rel/overlay/bin/remsh +++ b/rel/overlay/bin/remsh @@ -14,15 +14,15 @@ canonical_readlink () { - cd $(dirname $1); - FILE=$(basename $1); + FILE=$(dirname "$1")/$(basename "$1"); if [ -h "$FILE" ]; then - canonical_readlink $(readlink $FILE); + cd $(dirname "$1") + canonical_readlink $(readlink "$FILE"); else - echo "$(pwd -P)"; + cd "${1%/*}" && pwd -P; fi } -COUCHDB_BIN_DIR=$(canonical_readlink $0) +COUCHDB_BIN_DIR=$(canonical_readlink "$0") ERTS_BIN_DIR=$COUCHDB_BIN_DIR/../ ROOTDIR=${ERTS_BIN_DIR%/*} START_ERL=$(cat "$ROOTDIR/releases/start_erl.data") |