[merge] from unstable into stable

OneCDOnly · Jan 22, 2025 · af0dc48 · af0dc48
2 parents 3548cfd + a9abe62
commit af0dc48
Show file tree

Hide file tree

Showing 10 changed files with 394 additions and 340 deletions.
diff --git a/objects.tar.gz b/objects.tar.gz
diff --git a/sherpa-manager.tar.gz b/sherpa-manager.tar.gz
diff --git a/support/build-archives.sh b/support/build-archives.sh
@@ -24,14 +24,14 @@ for i in "${!a[@]}"; do
 	[[ -e ${b[i]} ]] && rm -f "${b[i]}"
 
 	if [[ ! -e ${a[i]} ]]; then
-		ColourTextBrightRed "'${a[i]}' not found, "
+		TextBrightRed "'${a[i]}' not found, "
 		continue
 	fi
 
 	tar --create --gzip --numeric-owner --file="${b[i]}" --directory="$support_path" "$(basename "${a[i]}")"
 
 	if [[ ! -s ${b[i]} ]]; then
-		ColourTextBrightRed "'${b[i]}' was not written"; echo
+		TextBrightRed "'${b[i]}' was not written"; echo
 		exit 1
 	fi
 

diff --git a/support/build-manager.sh b/support/build-manager.sh
@@ -9,7 +9,7 @@ manager_epoch=$(date +%s)
 SwapTags "$a" "$b"
 
 if grep -q '<?\|?>' "$b"; then
-	ColourTextBrightRed "'$b' contains unswapped tags, can't continue"; echo
+	TextBrightRed "'$b' contains unswapped tags, can't continue"; echo
 	exit 1
 fi
 

diff --git a/support/build-objects.sh b/support/build-objects.sh
@@ -188,7 +188,7 @@ for action in "${r_pip_actions[@]}"; do
 done
 
 if [[ ! -e $target ]]; then
-	ColourTextBrightRed "'$target' was not written to disk"; echo
+	TextBrightRed "'$target' was not written to disk"; echo
 	exit 1
 else
 	ShowDone
@@ -197,7 +197,7 @@ fi
 SwapTags "$target" "$target"
 
 if grep -q '<?\|?>' "$target"; then
-	ColourTextBrightRed "'$target' contains unswapped tags, can't continue"; echo
+	TextBrightRed "'$target' contains unswapped tags, can't continue"; echo
 	exit 1
 fi
 

diff --git a/support/merge-into-stable-and-release.sh b/support/merge-into-stable-and-release.sh
@@ -4,7 +4,7 @@
 
 release_tag=v${build_date}
 
-echo -en "ready to merge '$(ColourTextBrightRed "$unstable_branch")' branch into '$(ColourTextBrightGreen "$stable_branch")' branch as '$(ColourTextBrightWhite "$release_tag")': proceed? "
+echo -en "ready to merge '$(TextBrightRed "$unstable_branch")' branch into '$(TextBrightGreen "$stable_branch")' branch as '$(TextBrightWhite "$release_tag")': proceed? "
 read -rn1 response
 echo