From ebd74239a20165cd6525fcbf04bbc5373efef401 Mon Sep 17 00:00:00 2001
From: Alex Vandiver <alexmv@zulip.com>
Date: Tue, 28 Dec 2021 01:08:41 +0000
Subject: [PATCH] puppet: Move slash out of $dir by convention.

(cherry picked from commit 3c163a7d5e4a3f0382c71ef1a9b313f1fb4fa495)
---
 puppet/zulip/manifests/camo.pp         | 6 +++---
 puppet/zulip/manifests/external_dep.pp | 4 ++--
 puppet/zulip/manifests/golang.pp       | 6 +++---
 puppet/zulip/manifests/smokescreen.pp  | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/puppet/zulip/manifests/camo.pp b/puppet/zulip/manifests/camo.pp
index 39d39edd23..fe74dc924c 100644
--- a/puppet/zulip/manifests/camo.pp
+++ b/puppet/zulip/manifests/camo.pp
@@ -7,14 +7,14 @@ class zulip::camo (String $listen_address = '0.0.0.0') {
   }
 
   $version = '2.3.0'
-  $dir = "/srv/zulip-go-camo-${version}/"
-  $bin = "${dir}bin/go-camo"
+  $dir = "/srv/zulip-go-camo-${version}"
+  $bin = "${dir}/bin/go-camo"
 
   zulip::external_dep { 'go-camo':
     version        => $version,
     url            => "https://github.com/cactus/go-camo/releases/download/v${version}/go-camo-${version}.go1171.linux-amd64.tar.gz",
     sha256         => '965506e6edb9d974c810519d71e847afb7ca69d1d01ae7d8be6d7a91de669c0c',
-    tarball_prefix => "go-camo-${version}/",
+    tarball_prefix => "go-camo-${version}",
     bin            => 'bin/go-camo',
   }
 
diff --git a/puppet/zulip/manifests/external_dep.pp b/puppet/zulip/manifests/external_dep.pp
index 131eb8cb95..20f5c614d0 100644
--- a/puppet/zulip/manifests/external_dep.pp
+++ b/puppet/zulip/manifests/external_dep.pp
@@ -6,7 +6,7 @@ define zulip::external_dep(
   String $bin = '',
 ) {
 
-  $dir = "/srv/zulip-${title}-${version}/"
+  $dir = "/srv/zulip-${title}-${version}"
 
   zulip::sha256_tarball_to { $title:
     url     => $url,
@@ -22,7 +22,7 @@ define zulip::external_dep(
   }
 
   if $bin != '' {
-    file { "${dir}${bin}":
+    file { "${dir}/${bin}":
       ensure  => file,
       require => File[$dir],
     }
diff --git a/puppet/zulip/manifests/golang.pp b/puppet/zulip/manifests/golang.pp
index afc6625a6e..8287018e08 100644
--- a/puppet/zulip/manifests/golang.pp
+++ b/puppet/zulip/manifests/golang.pp
@@ -3,14 +3,14 @@
 class zulip::golang {
   $version = '1.17.3'
 
-  $dir = "/srv/zulip-golang-${version}/"
-  $bin = "${dir}bin/go"
+  $dir = "/srv/zulip-golang-${version}"
+  $bin = "${dir}/bin/go"
 
   zulip::external_dep { 'golang':
     version        => $version,
     url            => "https://golang.org/dl/go${version}.linux-amd64.tar.gz",
     sha256         => '550f9845451c0c94be679faf116291e7807a8d78b43149f9506c1b15eb89008c',
-    tarball_prefix => 'go/',
+    tarball_prefix => 'go',
     bin            => 'bin/go',
   }
 }
diff --git a/puppet/zulip/manifests/smokescreen.pp b/puppet/zulip/manifests/smokescreen.pp
index b7d3fe6f63..690a675c83 100644
--- a/puppet/zulip/manifests/smokescreen.pp
+++ b/puppet/zulip/manifests/smokescreen.pp
@@ -3,14 +3,14 @@ class zulip::smokescreen {
   include zulip::golang
 
   $version = 'dc403015f563eadc556a61870c6ad327688abe88'
-  $dir = "/srv/zulip-smokescreen-src-${version}/"
+  $dir = "/srv/zulip-smokescreen-src-${version}"
   $bin = "/usr/local/bin/smokescreen-${version}-go-${zulip::golang::version}"
 
   zulip::external_dep { 'smokescreen-src':
     version        => $version,
     url            => "https://github.com/stripe/smokescreen/archive/${version}.tar.gz",
     sha256         => 'ad4b181d14adcd9425045152b903a343dbbcfcad3c1e7625d2c65d1d50e1959d',
-    tarball_prefix => "smokescreen-${version}/",
+    tarball_prefix => "smokescreen-${version}",
   }
 
   exec { 'compile smokescreen':