ci(bump): fix wait

Author: thomasleplus

xml/bump-apk-versions.sh

@@ -13,8 +13,8 @@ if [ -f /.dockerenv ]; then
 
 	u=$(\apk -u list | \tr '\n' '|')
 
+	\rm -f .bump.csv.bak
 	\sed -e :a -e '/\\$/N; s/\\\n//; ta' Dockerfile | \grep -o -e 'apk[^\&\;]*add[^\&\;]*' | \grep -o -e '[^ ]*=[^ ]*' | while IFS= read -r l; do
-		\rm -f .bump.csv.bak
 		p="${l%=*}"
 		v1="${l#*=}"
 		v="$(echo "|${u}" | \grep -o -e "\|${p}-[^\|]*upgradable from: ${p}-${v1}" || true)"

xml/create-bump-prs.sh

@@ -9,6 +9,7 @@ if [ -f .bump.csv.bak ]; then
 		>&2 echo "error: git repo contains uncommitted changes"
 		exit 1
 	fi
+	\git pull
 	csv="$(\cat .bump.csv.bak)"
 	\rm -f .bump.csv.bak
 	while IFS=',' read -r p v1 v2 l1 l2; do
@@ -17,10 +18,12 @@ if [ -f .bump.csv.bak ]; then
 		\perl -i -p -e "s|\Q${l1}\E|${l2}|g" Dockerfile
 		\git add Dockerfile
 		\git commit -S -m "build(deps): bump ${p} from ${v1} to ${v2}"
-		echo "Please review and push commit in branch \"${b}\". Waiting..."
-		while [ "$(git rev-list --count --left-only '@{u}...HEAD')" -gt 0 ]; do
+		echo -n "Please review and push commit in branch \"${b}\". Waiting..."
+		while [ "$(git rev-list --count --right-only 'origin...HEAD')" -gt 0 ]; do
 			\sleep 1
+			\echo -n .
 		done
+		\echo
 		\gh pr create -f -l build -l dependencies
 		\git checkout -
 	done <<<"${csv}"