From 33bca2d141069b25c51437655429c236b9d433e2 Mon Sep 17 00:00:00 2001
From: Anmol Sethi <hi@nhooyr.io>
Date: Wed, 27 May 2020 00:55:09 -0400
Subject: [PATCH] Adjust nfpm config for bindir removal

See https://github.com/goreleaser/nfpm/pull/142#issuecomment-634427333
---
 ci/build/build-packages.sh | 4 ++--
 ci/build/nfpm.yaml         | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ci/build/build-packages.sh b/ci/build/build-packages.sh
index 01511c5ca..2d0ed8746 100755
--- a/ci/build/build-packages.sh
+++ b/ci/build/build-packages.sh
@@ -21,7 +21,7 @@ main() {
     fi
   fi
 
-  if [[ $OSTYPE == linux* ]]; then
+  if [[ $OS == "linux" ]]; then
     release_nfpm
   fi
 }
@@ -48,7 +48,7 @@ release_gcp() {
 # Generates deb and rpm packages.
 release_nfpm() {
   local nfpm_config
-  nfpm_config=$(envsubst < ./ci/build/nfpm.yaml)
+  nfpm_config="$(envsubst < ./ci/build/nfpm.yaml)"
 
   # The underscores are convention for .deb.
   nfpm pkg -f <(echo "$nfpm_config") --target "release-packages/code-server_${VERSION}_$ARCH.deb"
diff --git a/ci/build/nfpm.yaml b/ci/build/nfpm.yaml
index c290eb18b..194e78ee5 100644
--- a/ci/build/nfpm.yaml
+++ b/ci/build/nfpm.yaml
@@ -10,7 +10,6 @@ description: |
 vendor: "Coder"
 homepage: "https://github.com/cdr/code-server"
 license: "MIT"
-bindir: "/usr/bin"
 files:
   ./ci/build/code-server-nfpm.sh: /usr/bin/code-server
   ./ci/build/code-server.service: /usr/lib/systemd/user/code-server.service