1 files changed, 4 insertions, 2 deletions
diff --git a/bootstrap b/bootstrap
index 46d6205..c014abf 100755
--- a/bootstrap
+++ b/bootstrap
@@ -6,6 +6,9 @@ if [ "${BASH_VERSINFO[0]}" -lt 4 ]; then
     exit 1
 fi
 
+# see #849
+unset CDPATH
+
 ########################################
 # Common meta-language implementation. Syntax:
 #
@@ -399,7 +402,7 @@ cmp_versions()
 {
     local v1="${1}"
     local v2="${2}"
-    local e1=0 e2=0 u1 u2 d1=0 d2=0
+    local e1=0 e2=0 d1=0 d2=0
 
     # Case-insensitive comparison
     v1="${v1^^}"
@@ -640,7 +643,6 @@ enter_version()
 enter_milestone()
 {
     local ms="${1}"
-    local cmp
 
     info[ms]=${ms}
     if [ -n "${info[ver]}" ]; then