From 0534ba8fed44ea22570184b02005ac0676b426f0 Mon Sep 17 00:00:00 2001
From: Todd Short <todd.short@me.com>
Date: Thu, 9 Oct 2025 13:27:43 -0400
Subject: [PATCH] UPSTREAM: <carry>: Clean up cp-manifests

There is no longer a need to copy conditionally

Signed-off-by: Todd Short <todd.short@me.com>
---
 openshift/catalogd/cp-manifests            | 8 +++-----
 openshift/operator-controller/cp-manifests | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/openshift/catalogd/cp-manifests b/openshift/catalogd/cp-manifests
index ca5e7fcce..0251b1451 100755
--- a/openshift/catalogd/cp-manifests
+++ b/openshift/catalogd/cp-manifests
@@ -5,10 +5,8 @@ if [ -z "${1}" ]; then
    exit 1
 fi
 
-DEST=${1}
+DEST="${1}/helm/catalogd"
 
-if [ -d /openshift/helm ]; then
-    mkdir -p "${DEST}/helm/catalogd"
-    cp -a /openshift/helm/* "${DEST}/helm/catalogd"
-fi
+mkdir -p "${DEST}"
+cp -a /openshift/helm/* "${DEST}"
 
diff --git a/openshift/operator-controller/cp-manifests b/openshift/operator-controller/cp-manifests
index 722d7c645..d3e89ede9 100755
--- a/openshift/operator-controller/cp-manifests
+++ b/openshift/operator-controller/cp-manifests
@@ -5,10 +5,8 @@ if [ -z "${1}" ]; then
    exit 1
 fi
 
-DEST=${1}
+DEST="${1}/helm/operator-controller"
 
-if [ -d /openshift/helm ]; then
-    mkdir -p "${DEST}/helm/operator-controller"
-    cp -a /openshift/helm/* "${DEST}/helm/operator-controller"
-fi
+mkdir -p "${DEST}"
+cp -a /openshift/helm/* "${DEST}"