Code Review
/
infra
/
cicd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
cloud-infra: Use prebuilt deployment image
[infra/cicd.git]
/
jjb
/
cloud-infra
/
wait-for-pkg-manager.sh
diff --git
a/jjb/cloud-infra/wait-for-pkg-manager.sh
b/jjb/cloud-infra/wait-for-pkg-manager.sh
index 53eaa096715a8ebfdcb1f6e55c74d11e3d673a4c..70c0c0dcdf1692da589e1d0420fae08f05097cfa 100644
(file)
--- a/
jjb/cloud-infra/wait-for-pkg-manager.sh
+++ b/
jjb/cloud-infra/wait-for-pkg-manager.sh
@@
-20,7
+20,6
@@
set -o errexit
set -o nounset
set -o errexit
set -o nounset
-set -o pipefail
source /etc/os-release || source /usr/lib/os-release
case ${ID,,} in
source /etc/os-release || source /usr/lib/os-release
case ${ID,,} in
@@
-39,7
+38,8
@@
echo "Checking for running package manager instance..."
while true; do
pkg_mgr_process=$(pgrep -f $pkg_mgr_cmd | cat)
if [[ -n $pkg_mgr_process ]]; then
while true; do
pkg_mgr_process=$(pgrep -f $pkg_mgr_cmd | cat)
if [[ -n $pkg_mgr_process ]]; then
- echo "Waiting for $pkg_mgr_cmd process $pkg_mgr_process to finish..."
+ echo "Waiting for $pkg_mgr_cmd processes to finish..."
+ echo "$pkg_mgr_process"
sleep 10
else
echo "$pkg_mgr_cmd process done. Continuing..."
sleep 10
else
echo "$pkg_mgr_cmd process done. Continuing..."