From 4c1b89576c61b293d30b9f8914462ce5a9d8fb16 Mon Sep 17 00:00:00 2001 From: Troy Varney Date: Wed, 18 Nov 2020 10:39:57 -0600 Subject: [PATCH] DEVTOOLS-7936: Remove redundant chgrp from publish This removes the redundant chgrp command from the publish step when pushing packages to our public repositories. The directory being pushed to has the setgid bit set on it, which means that we don't need to force the group using this command. Further, attempting to do so resulted in an error as the cfsync user does not have the appropriate permissions to use the chgrp command. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 157bd3bd..959e35af 100644 --- a/Makefile +++ b/Makefile @@ -89,7 +89,7 @@ define publish_package for HOST in $(CF_PKG_HOSTS); do \ ssh-keyscan -t rsa $$HOST >> ~/.ssh/known_hosts; \ scp -4 cloudflared*.$(1) cfsync@$$HOST:/state/cf-pkg/staging/$(2)/$(TARGET_PUBLIC_REPO)/cloudflared/; \ - ssh cfsync@$$HOST 'chgrp cf /state/cf-pkg/staging/$(2)/$(TARGET_PUBLIC_REPO)/cloudflared/*.$(1) && chmod g+w /state/cf-pkg/staging/$(2)/$(TARGET_PUBLIC_REPO)/cloudflared/*.$(1)'; \ + ssh cfsync@$$HOST 'chmod g+w /state/cf-pkg/staging/$(2)/$(TARGET_PUBLIC_REPO)/cloudflared/*.$(1)'; \ done endef