Skip to content

Commit 47b524b

Browse files
committed
Use absolute path for sourced sh files so that commands work even if not in a PATH directory
1 parent e34adf2 commit 47b524b

10 files changed

Lines changed: 22 additions & 19 deletions

File tree

src/artifacts-helper/install.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ALIAS_NPX="${NPXALIAS:-"true"}"
1212
ALIAS_RUSH="${RUSHALIAS:-"true"}"
1313
ALIAS_PNPM="${PNPMALIAS:-"true"}"
1414
INSTALL_PIP_HELPER="${PYTHON:-"false"}"
15-
SHIM_DIRECTORY="${SHIMDIRECTORY:-"/usr/local/share/codespace-shims"}"
15+
SHIM_DIRECTORY="${SHIMDIRECTORY:-"/usr/local/share/codespace-shims/"}"
1616

1717
ALIASES_ARR=()
1818

@@ -86,6 +86,9 @@ chmod +rx /tmp/install-python-keyring.sh
8686
sed -i "s|REPLACE_WITH_AZURE_DEVOPS_NUGET_FEED_URL_PREFIX|${PREFIXES}|g" ./scripts/dotnet
8787
sed -i "s|REPLACE_WITH_AZURE_DEVOPS_NUGET_FEED_URL_PREFIX|${PREFIXES}|g" ./scripts/nuget
8888

89+
# Create ${SHIM_DIRECTORY}
90+
mkdir -p "${SHIM_DIRECTORY}"
91+
8992
# Install helper scripts in ${SHIM_DIRECTORY}
9093
cp "./scripts/auth-ado.sh" "${SHIM_DIRECTORY}"
9194
cp "./scripts/resolve-shim.sh" "${SHIM_DIRECTORY}"

src/artifacts-helper/scripts/dotnet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
2-
source auth-ado.sh
3-
source resolve-shim.sh
2+
source "$(dirname $0)"/auth-ado.sh
3+
source "$(dirname $0)"/resolve-shim.sh
44

55
# Install artifact credential provider if it is not already installed
66
if [ ! -d "${HOME}/.nuget/plugins/netcore" ]; then

src/artifacts-helper/scripts/npm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
2-
source auth-ado.sh
3-
source resolve-shim.sh
2+
source "$(dirname $0)"/auth-ado.sh
3+
source "$(dirname $0)"/resolve-shim.sh
44

55
NPM_EXE="$(resolve_shim)"
66
ARTIFACTS_ACCESSTOKEN="${ARTIFACTS_ACCESSTOKEN:-}" ${NPM_EXE} "$@"

src/artifacts-helper/scripts/npx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
2-
source auth-ado.sh
3-
source resolve-shim.sh
2+
source "$(dirname $0)"/auth-ado.sh
3+
source "$(dirname $0)"/resolve-shim.sh
44

55
NPX_EXE="$(resolve_shim)"
66
ARTIFACTS_ACCESSTOKEN="${ARTIFACTS_ACCESSTOKEN:-}" ${NPX_EXE} "$@"

src/artifacts-helper/scripts/nuget

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
2-
source auth-ado.sh
3-
source resolve-shim.sh
2+
source "$(dirname $0)"/auth-ado.sh
3+
source "$(dirname $0)"/resolve-shim.sh
44

55
# Install artifact credential provider if it is not already installed
66
if [ ! -d "${HOME}/.nuget/plugins/netcore" ]; then

src/artifacts-helper/scripts/pnpm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
2-
source auth-ado.sh
3-
source resolve-shim.sh
2+
source "$(dirname $0)"/auth-ado.sh
3+
source "$(dirname $0)"/resolve-shim.sh
44

55
PNPM_EXE="$(resolve_shim)"
66
ARTIFACTS_ACCESSTOKEN="${ARTIFACTS_ACCESSTOKEN:-}" ${PNPM_EXE} "$@"

src/artifacts-helper/scripts/pnpx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
2-
source auth-ado.sh
3-
source resolve-shim.sh
2+
source "$(dirname $0)"/auth-ado.sh
3+
source "$(dirname $0)"/resolve-shim.sh
44

55
PNPX_EXE="$(resolve_shim)"
66
ARTIFACTS_ACCESSTOKEN="${ARTIFACTS_ACCESSTOKEN:-}" ${PNPX_EXE} "$@"

src/artifacts-helper/scripts/rush

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
2-
source auth-ado.sh
3-
source resolve-shim.sh
2+
source "$(dirname $0)"/auth-ado.sh
3+
source "$(dirname $0)"/resolve-shim.sh
44

55
RUSH_EXE="$(resolve_shim)"
66
ARTIFACTS_ACCESSTOKEN="${ARTIFACTS_ACCESSTOKEN:-}" ${RUSH_EXE} "$@"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
2-
source auth-ado.sh
3-
source resolve-shim.sh
2+
source "$(dirname $0)"/auth-ado.sh
3+
source "$(dirname $0)"/resolve-shim.sh
44

55
RUSH_PNPM_EXE="$(resolve_shim)"
66
ARTIFACTS_ACCESSTOKEN="${ARTIFACTS_ACCESSTOKEN:-}" ${RUSH_PNPM_EXE} "$@"

src/artifacts-helper/scripts/yarn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
2-
source auth-ado.sh
3-
source resolve-shim.sh
2+
source "$(dirname $0)"/auth-ado.sh
3+
source "$(dirname $0)"/resolve-shim.sh
44

55
YARN_EXE="$(resolve_shim)"
66
ARTIFACTS_ACCESSTOKEN="${ARTIFACTS_ACCESSTOKEN:-}" ${YARN_EXE} "$@"

0 commit comments

Comments
 (0)