From b3906e04664120d8108a6a743dbfc4221ac138a4 Mon Sep 17 00:00:00 2001
From: Madhura Bhave <mbhave@pivotal.io>
Date: Tue, 31 Mar 2020 11:54:20 -0700
Subject: [PATCH] Fix no such directory error on CI

See gh-20530
---
 ci/scripts/create-pull-request.sh   | 4 +---
 ci/scripts/detect-docker-updates.sh | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ci/scripts/create-pull-request.sh b/ci/scripts/create-pull-request.sh
index 3ea42d5870..b8e020288e 100755
--- a/ci/scripts/create-pull-request.sh
+++ b/ci/scripts/create-pull-request.sh
@@ -1,9 +1,7 @@
 #!/bin/bash
 set -e
 
-commit_message=$( cat commit-details/message )
-
-if [[ ${commit_message} != "" ]]; then
+if [[ -f commit-details/message ]]; then
 	curl \
 	  -s \
 		-u ${GITHUB_USERNAME}:${GITHUB_PASSWORD} \
diff --git a/ci/scripts/detect-docker-updates.sh b/ci/scripts/detect-docker-updates.sh
index 52f3d1d3cf..7ef834ccf6 100755
--- a/ci/scripts/detect-docker-updates.sh
+++ b/ci/scripts/detect-docker-updates.sh
@@ -28,6 +28,7 @@ if [[ ${existing_upgrade_issues} = "" ]]; then
 	git add ci/images/get-docker-url.sh > /dev/null
 	commit_message="Upgrade to Docker $latest_version in CI"
 	git commit -m "$commit_message" > /dev/null
+	popd
 	echo ${commit_message} > commit-details/message
 else
 	echo "Pull request already exists."