mirror of
https://github.com/digital-asset/daml.git
synced 2024-09-19 16:57:40 +03:00
Replace cd .. && pwd
with readlink -f
(#17152)
The output of `cd` might be altered by `CDPATH` set on a system, leading to `dade` being broken because it cannot read the current path. Instead, using `readlink -f` seem to get the job done without side effects.
This commit is contained in:
parent
a9e579e278
commit
d999a21ac3
4
.envrc
4
.envrc
@ -16,4 +16,6 @@ HOOK_TYPES=(pre-commit pre-merge-commit pre-push prepare-commit-msg commit-msg p
|
||||
for HOOK_TYPE in ${HOOK_TYPES[@]}; do pre-commit uninstall -t "$HOOK_TYPE" > /dev/null; done
|
||||
|
||||
# install pre-commit hook (opt-out by setting `DADE_NO_PRE_COMMIT`, set the hook type with `DADE_PRE_COMMIT_HOOK_TYPE` -- defaults to 'pre-push')
|
||||
test "x$DADE_NO_PRE_COMMIT" = x && pre-commit install -t "$DADE_PRE_COMMIT_HOOK_TYPE" > /dev/null
|
||||
if [[ -z "${DADE_NO_PRE_COMMIT:-}" ]]; then
|
||||
pre-commit install -t "$DADE_PRE_COMMIT_HOOK_TYPE" > /dev/null
|
||||
fi
|
||||
|
@ -3,7 +3,7 @@
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
DADE_CURRENT_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
DADE_CURRENT_SCRIPT_DIR="$( dirname $( readlink -f "${BASH_SOURCE[0]}" ) )"
|
||||
cd $DADE_CURRENT_SCRIPT_DIR
|
||||
cd ../..
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
THIS_DIR="$( dirname $( readlink -f "${BASH_SOURCE[0]}" ) )"
|
||||
####################################################################
|
||||
|
||||
cd $THIS_DIR/../..
|
||||
|
@ -1,8 +1,8 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
DADE_CURRENT_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
DADE_CURRENT_SCRIPT_DIR="$( dirname $( readlink -f "${BASH_SOURCE[0]}" ) )"
|
||||
source "$DADE_CURRENT_SCRIPT_DIR/../lib/dade-common"
|
||||
DADE_CURRENT_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
DADE_CURRENT_SCRIPT_DIR="$( dirname $( readlink -f "${BASH_SOURCE[0]}" ) )"
|
||||
|
||||
if [ $# -lt 1 ]; then
|
||||
"$DADE_CURRENT_SCRIPT_DIR"/dade-help
|
||||
|
@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
DADE_CURRENT_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
DADE_CURRENT_SCRIPT_DIR="$( dirname $( readlink -f "${BASH_SOURCE[0]}" ) )"
|
||||
source "$DADE_CURRENT_SCRIPT_DIR/../lib/dade-common"
|
||||
|
||||
linkTool java out "${DADE_DEVENV_DIR}/jdk"
|
||||
|
@ -2,7 +2,7 @@
|
||||
#
|
||||
# Compute the size of the development environment closure
|
||||
#
|
||||
DADE_CURRENT_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
DADE_CURRENT_SCRIPT_DIR="$( dirname $( readlink -f "${BASH_SOURCE[0]}" ) )"
|
||||
PATHS=$DADE_CURRENT_SCRIPT_DIR/../var/gc-roots/*/
|
||||
|
||||
for bin in $PATHS; do
|
||||
|
@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env bash
|
||||
DADE_CURRENT_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
DADE_CURRENT_SCRIPT_DIR="$( dirname $( readlink -f "${BASH_SOURCE[0]}" ) )"
|
||||
BASEL_CACHE_DIR="${DADE_CURRENT_SCRIPT_DIR}/../../.bazel-cache"
|
||||
source "$DADE_CURRENT_SCRIPT_DIR/../lib/dade-common"
|
||||
|
||||
|
@ -11,7 +11,7 @@ EOF
|
||||
exit 1
|
||||
fi
|
||||
|
||||
DADE_CURRENT_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
DADE_CURRENT_SCRIPT_DIR="$( dirname $( readlink -f "${BASH_SOURCE[0]}" ) )"
|
||||
eval "$("${DADE_CURRENT_SCRIPT_DIR}/../lib/dade-dump-profile")"
|
||||
|
||||
exec "$@"
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
set -Eeuo pipefail
|
||||
|
||||
DADE_CURRENT_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
DADE_CURRENT_SCRIPT_DIR="$( dirname $( readlink -f "${BASH_SOURCE[0]}" ) )"
|
||||
|
||||
if [[ "$DADE_CURRENT_SCRIPT_DIR" =~ ^/nix/store/.* ]]; then
|
||||
echo "Unable to release dev-env from Nix store. Are you running this from another repository than `da`?"
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Installs nix and prepares some common tools
|
||||
#
|
||||
|
||||
DADE_CURRENT_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
DADE_CURRENT_SCRIPT_DIR="$( dirname $( readlink -f "${BASH_SOURCE[0]}" ) )"
|
||||
|
||||
if [[ "$DADE_CURRENT_SCRIPT_DIR" =~ ^/nix/store/.* ]]; then
|
||||
echo "Unable to init dev-env from Nix store. Are you running this from another repository than `da`?"
|
||||
|
@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env bash
|
||||
#set -e
|
||||
|
||||
DADE_CURRENT_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
DADE_CURRENT_SCRIPT_DIR="$( dirname $( readlink -f "${BASH_SOURCE[0]}" ) )"
|
||||
source "$DADE_CURRENT_SCRIPT_DIR/../lib/dade-common"
|
||||
|
||||
# run 'buildTool' on each of the tools.
|
||||
|
@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env bash
|
||||
#set -e
|
||||
|
||||
DADE_CURRENT_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
DADE_CURRENT_SCRIPT_DIR="$( dirname $( readlink -f "${BASH_SOURCE[0]}" ) )"
|
||||
PATH=$DADE_CURRENT_SCRIPT_DIR:$PATH
|
||||
source "$DADE_CURRENT_SCRIPT_DIR/../lib/dade-common"
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env bash
|
||||
BIN_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
BIN_DIR="$( dirname $( readlink -f "${BASH_SOURCE[0]}" ) )"
|
||||
source "$BIN_DIR/../lib/dade-common"
|
||||
cd $BIN_DIR/../../
|
||||
execTool da-hs-release-tool out da-hs-release-tool "$@"
|
||||
|
@ -9,8 +9,8 @@ if [[ -n "${DADE_DEBUG+x}" ]]; then
|
||||
set -x
|
||||
fi
|
||||
|
||||
DADE_CURRENT_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
DADE_BASE_ROOT="$( cd "${DADE_CURRENT_SCRIPT_DIR}/../../" && pwd)"
|
||||
DADE_CURRENT_SCRIPT_DIR="$( dirname $( readlink -f "${BASH_SOURCE[0]}" ) )"
|
||||
DADE_BASE_ROOT="$( readlink -f "${DADE_CURRENT_SCRIPT_DIR}/../../" )"
|
||||
|
||||
errcho() {
|
||||
>&2 echo "[dev-env] $@"
|
||||
|
@ -65,7 +65,7 @@ nix_tool() {
|
||||
# TODO(gleber): Compatibility mode until JBH is ugraded.
|
||||
DADE_DEVENV_DIR="${DADE_DEVENV_DIR:-${DADE_BASE:-}}"
|
||||
if [ -z "$DADE_DEVENV_DIR" ]; then
|
||||
DADE_DEVENV_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
|
||||
DADE_DEVENV_DIR="$( dirname $( readlink -f "${BASH_SOURCE[0]}" ) )"
|
||||
fi
|
||||
export DADE_DEVENV_DIR="${DADE_DEVENV_DIR}"
|
||||
export DADE_REPO_ROOT="${DADE_REPO_ROOT:-${DADE_DEVENV_DIR}/..}"
|
||||
|
@ -3,7 +3,7 @@
|
||||
# tool. Execute a Nix tool from a derivation that creates a `result-bin`
|
||||
# directory.
|
||||
|
||||
DADE_CURRENT_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
DADE_CURRENT_SCRIPT_DIR="$( dirname $( readlink -f "${BASH_SOURCE[0]}" ) )"
|
||||
source "$DADE_CURRENT_SCRIPT_DIR/../lib/dade-common"
|
||||
base=$(basename $0)
|
||||
execTool $base bin $base "$@"
|
||||
|
@ -2,7 +2,7 @@
|
||||
# Meant to be linked to from `dev-env/bin`, symlink should be named after the
|
||||
# tool. Execute a Nix tool from a derivation that creates a `result` directory.
|
||||
|
||||
DADE_CURRENT_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
DADE_CURRENT_SCRIPT_DIR="$( dirname $( readlink -f "${BASH_SOURCE[0]}" ) )"
|
||||
source "$DADE_CURRENT_SCRIPT_DIR/../lib/dade-common"
|
||||
base=$(basename $0)
|
||||
execTool $base out $base "$@"
|
||||
|
Loading…
Reference in New Issue
Block a user