Use variable names less likely to be shadowed
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
common_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
ROOT="$DIR/../../"
|
ROOT="$common_DIR/../../"
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,13 @@
|
|||||||
# FIXME this shouldn't be hardcoded here of course
|
node_common_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
|
|
||||||
nodejs_binary_dir="$DIR/../binaries/node-v22.15.1-linux-x64/bin"
|
# FIXME this shouldn't be hardcoded here of course
|
||||||
|
nodejs_binary_dir="$node_common_DIR/../binaries/node-v22.15.1-linux-x64/bin"
|
||||||
|
|
||||||
# This might be too restrictive. Or not restrictive enough.
|
# This might be too restrictive. Or not restrictive enough.
|
||||||
PATH="$nodejs_binary_dir":/bin:/usr/bin
|
PATH="$nodejs_binary_dir":/bin:/usr/bin
|
||||||
|
|
||||||
|
|
||||||
project_root="$DIR/../.."
|
project_root="$node_common_DIR/../.."
|
||||||
|
|
||||||
node_dir="$project_root/$nodejs_binary_dir"
|
node_dir="$project_root/$nodejs_binary_dir"
|
||||||
|
|
||||||
@@ -15,7 +16,7 @@ export NPM_CONFIG_CACHE="$node_dir/cache"
|
|||||||
export NPM_CONFIG_TMP="$node_dir/tmp"
|
export NPM_CONFIG_TMP="$node_dir/tmp"
|
||||||
export NODE_PATH="$node_dir/node_modules"
|
export NODE_PATH="$node_dir/node_modules"
|
||||||
|
|
||||||
echo $NPM_CONFIG_PREFIX
|
# echo $NPM_CONFIG_PREFIX
|
||||||
echo $NPM_CONFIG_CACHE
|
# echo $NPM_CONFIG_CACHE
|
||||||
echo $NPM_CONFIG_TMP
|
# echo $NPM_CONFIG_TMP
|
||||||
echo $NODE_PATH
|
# echo $NODE_PATH
|
||||||
|
|||||||
Reference in New Issue
Block a user