diff options
| author | Ronny <ronny@kioskkinder.com> | 2020-01-04 17:29:43 +0100 |
|---|---|---|
| committer | Jan Lehnardt <jan@apache.org> | 2020-01-04 17:29:43 +0100 |
| commit | d5568d1bbbed134091e34a1fa292f1ae2b361adf (patch) | |
| tree | 69a250cf96a010d2d9cae04b03277a632298f238 | |
| parent | ee47f93a0a847cc4b4c3e4e8f47462050b91c555 (diff) | |
| download | couchdb-d5568d1bbbed134091e34a1fa292f1ae2b361adf.tar.gz | |
Fixes #2151 - start CouchDB from symlinks (#2152)
| -rwxr-xr-x | rel/files/couchdb.in | 12 | ||||
| -rwxr-xr-x | rel/overlay/bin/remsh | 12 |
2 files changed, 22 insertions, 2 deletions
diff --git a/rel/files/couchdb.in b/rel/files/couchdb.in index b3c7e98e2..f64c0f860 100755 --- a/rel/files/couchdb.in +++ b/rel/files/couchdb.in @@ -12,7 +12,17 @@ # License for the specific language governing permissions and limitations under # the License. -COUCHDB_BIN_DIR=$(cd "${0%/*}" && pwd) +canonical_readlink () + { + cd $(dirname $1); + FILE=$(basename $1); + if [ -h "$FILE" ]; then + canonical_readlink $(readlink $FILE); + else + echo "$(pwd -P)"; + fi +} +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 2ac421b07..b8946ace3 100755 --- a/rel/overlay/bin/remsh +++ b/rel/overlay/bin/remsh @@ -12,7 +12,17 @@ # License for the specific language governing permissions and limitations under # the License. -COUCHDB_BIN_DIR=$(cd "${0%/*}" && pwd) +canonical_readlink () + { + cd $(dirname $1); + FILE=$(basename $1); + if [ -h "$FILE" ]; then + canonical_readlink $(readlink $FILE); + else + echo "$(pwd -P)"; + fi +} +COUCHDB_BIN_DIR=$(canonical_readlink $0) ERTS_BIN_DIR=$COUCHDB_BIN_DIR/../ ROOTDIR=${ERTS_BIN_DIR%/*} START_ERL=$(cat "$ROOTDIR/releases/start_erl.data") |