20884: Update Makefile copy rule to accommodate rocky8
authorBrett Smith <brett.smith@curii.com>
Thu, 24 Aug 2023 19:41:16 +0000 (15:41 -0400)
committerBrett Smith <brett.smith@curii.com>
Thu, 24 Aug 2023 19:41:35 +0000 (15:41 -0400)
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith@curii.com>

Makefile

index 0c618fd096386bba1a7744d77c7af11a19a164a3..2ca5e79a18cff60bff655c6d3cdb9938494b5785 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -125,16 +125,15 @@ $(RPM_FILE): build
        etc/arvados/workbench2/workbench2.example.json=/etc/arvados/$(APP_NAME)/workbench2.example.json
 
 copy: $(DEB_FILE) $(RPM_FILE)
-       for target in $(TARGETS) ; do \
-               mkdir -p packages/$$target
-               if [[ $$target =~ ^centos ]]; then
-                       cp -p $(RPM_FILE) packages/$$target ; \
-               else
-                       cp -p $(DEB_FILE) packages/$$target ; \
-               fi
-       done
-       rm -f $(RPM_FILE)
-       rm -f $(DEB_FILE)
+       for target in $(TARGETS); do \
+               mkdir -p "packages/$$target" && \
+               case "$$target" in \
+                       centos*|rocky*) cp -p "$(RPM_FILE)" "packages/$$target" ;; \
+                       debian*|ubuntu*) cp -p "$(DEB_FILE)" "packages/$$target" ;; \
+                       *) echo "Unknown copy target $$target"; exit 1 ;; \
+               esac ; \
+       done ; \
+       rm -f "$(DEB_FILE)" "$(RPM_FILE)"
 
 # use FPM to create DEB and RPM
 packages: copy