Merge pull request kubernetes#139 from marun/fix-recent-bash

Fix deployment of recent bash
marun · Jun 4, 2020 · e9b260a · e9b260a
2 parents 04627e9 + 1fce058
commit e9b260a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/openshift-build/lib/bash.sh b/openshift-build/lib/bash.sh
@@ -15,7 +15,7 @@ function os::recent_bash() {
     recent_bash_path="${BASETMPDIR}/recent-bash"
     mkdir -p "${recent_bash_path}"
     pushd "${recent_bash_path}" > /dev/null
-      if [[ ! -f "bash-5.0/bash" ]]; then
+      if [[ ! -f bash ]]; then
         curl -LO https://ftp.gnu.org/gnu/bash/bash-5.0.tar.gz
         tar xf bash-5.0.tar.gz
         pushd bash-5.0 > /dev/null
@@ -24,8 +24,8 @@ function os::recent_bash() {
           cp bash ..
         popd > /dev/null
       fi
-      bash_path="$( pwd )/bash"
     popd > /dev/null
+    bash_path="${recent_bash_path}/bash"
   fi
   echo "${bash_path}"
 }