From 8e617df914905740552fbc6eefcb0feb29346595 Mon Sep 17 00:00:00 2001
From: Michael Borkenstein <mborkenstein@cloudflare.com>
Date: Mon, 13 Jul 2020 12:14:48 -0500
Subject: [PATCH] Change scp command to use file glob that matches both
 cloudflared rpms and debs

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index d430139d..c73cce51 100644
--- a/Makefile
+++ b/Makefile
@@ -83,17 +83,17 @@ test-ssh-server:
 define publish_package
 	for HOST in $(CF_PKG_HOSTS); do \
 		ssh-keyscan -t rsa $$HOST >> ~/.ssh/known_hosts; \
-		scp -4 cloudflared_$(VERSION)_amd64.deb cfsync@$$HOST:/state/cf-pkg/staging/$(1)/$(TARGET_PUBLIC_REPO)/cloudflared/; \
+		scp -4 cloudflared*.$(1) cfsync@$$HOST:/state/cf-pkg/staging/$(2)/$(TARGET_PUBLIC_REPO)/cloudflared/; \
 	done
 endef
 
 .PHONY: publish-deb
 publish-deb: cloudflared-deb
-	$(call publish_package,apt)
+	$(call publish_package,deb,apt)
 
 .PHONY: publish-rpm
 publish-rpm: cloudflared-rpm
-	$(call publish_package,yum)
+	$(call publish_package,rpm,yum)
 
 define build_package
 	mkdir -p $(PACKAGE_DIR)