WIP: patch script fixups

Signed-off-by: Todd Short <[email protected]>

Author: tmshort

hack/tools/patch-base-for-helm.sh

@@ -1,15 +1,13 @@
 #!/bin/bash
 
-set -x
-
 # Patch catalogd rbac
 catalogd_rbac_filelist=(
     helm/olmv1/base/catalogd/rbac/experimental/*.yaml
     helm/olmv1/base/catalogd/rbac/standard/*.yaml
 )
 for f in "${catalogd_rbac_filelist[@]}"; do
     yq -i '.metadata.labels["app.kubernetes.io/name"] = "catalogd"' "${f}"
-    rm "${f}.bak"
+    rm -f "${f}.bak"
 done
 
 # Patch operator-controller rbac
@@ -19,7 +17,7 @@ operator_controller_rbac_filelist=(
 )
 for f in "${operator_controller_rbac_filelist[@]}"; do
     yq -i '.metadata.labels["app.kubernetes.io/name"] = "operator-controller"' "${f}"
-    rm "${f}.bak"
+    rm -f "${f}.bak"
 done
 
 # Patch catalogd webhook
@@ -37,7 +35,7 @@ for f in "${catalogd_webhook_filelist[@]}"; do
     yq -i '.webhooks[0].clientConfig.service.port = 9443' "${f}"
     yq -i '.webhooks[0].matchConditions[0].name = "MissingOrIncorrectMetadataNameLabel"' "${f}"
     yq -i '.webhooks[0].matchConditions[0].expression = "\"name\" in object.metadata && (!has(object.metadata.labels) || !(\"olm.operatorframework.io/metadata.name\" in object.metadata.labels) || object.metadata.labels[\"olm.operatorframework.io/metadata.name\"] != object.metadata.name)"' "${f}"
-    rm "${f}.bak"
+    rm -f "${f}.bak"
 done
 
 # Patch everything genericly
@@ -58,10 +56,10 @@ for f in "${filelist[@]}"; do
     # Patch in the temporary items
     yq -i '.metadata.annotations.replaceMe = "annotations"' "${f}"
     yq -i '.metadata.labels.replaceMe = "labels"' "${f}"
-    # Replace with helm template - must be done last or yq will complain about the file format
+    # Replace with helm template - must be done last or yq will complain about the file formXat
     sed -i.bak 's/replaceMe: annotations/{{- include "olmv1.annotations" . | nindent 4 }}/g' "${f}"
     sed -i.bak 's/replaceMe: labels/{{- include "olmv1.labels" . | nindent 4 }}/g' "${f}"
     sed -i.bak 's/olmv1-system/{{ .Values.namespaces.olmv1.name }}/g' "${f}"
     # Delete sed's backup file
-    rm "${f}.bak"
+    rm -f "${f}.bak"
 done