From 96d861f043e6ef2b668dec126dab988e09affde7 Mon Sep 17 00:00:00 2001
From: Michael Wolf <maw@pobox.com>
Date: Sun, 16 Nov 2025 12:25:48 -0600
Subject: [PATCH] Use variable names less likely to be shadowed

---
 framework/shims/common      |  4 ++--
 framework/shims/node.common | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/framework/shims/common b/framework/shims/common
index 9244976..a1391b9 100644
--- a/framework/shims/common
+++ b/framework/shims/common
@@ -1,4 +1,4 @@
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-ROOT="$DIR/../../"
+common_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+ROOT="$common_DIR/../../"
 
 
diff --git a/framework/shims/node.common b/framework/shims/node.common
index 3d4922b..22823c7 100644
--- a/framework/shims/node.common
+++ b/framework/shims/node.common
@@ -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.
 PATH="$nodejs_binary_dir":/bin:/usr/bin
 
 
-project_root="$DIR/../.."
+project_root="$node_common_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 NODE_PATH="$node_dir/node_modules"
 
-echo $NPM_CONFIG_PREFIX
-echo $NPM_CONFIG_CACHE
-echo $NPM_CONFIG_TMP
-echo $NODE_PATH
+# echo $NPM_CONFIG_PREFIX
+# echo $NPM_CONFIG_CACHE
+# echo $NPM_CONFIG_TMP
+# echo $NODE_PATH