Skip to content

Commit 33bca2d

Browse files
committed
Adjust nfpm config for bindir removal
See goreleaser/nfpm#142 (comment)
1 parent eb17a29 commit 33bca2d

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

ci/build/build-packages.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ main() {
2121
fi
2222
fi
2323

24-
if [[ $OSTYPE == linux* ]]; then
24+
if [[ $OS == "linux" ]]; then
2525
release_nfpm
2626
fi
2727
}
@@ -48,7 +48,7 @@ release_gcp() {
4848
# Generates deb and rpm packages.
4949
release_nfpm() {
5050
local nfpm_config
51-
nfpm_config=$(envsubst < ./ci/build/nfpm.yaml)
51+
nfpm_config="$(envsubst < ./ci/build/nfpm.yaml)"
5252

5353
# The underscores are convention for .deb.
5454
nfpm pkg -f <(echo "$nfpm_config") --target "release-packages/code-server_${VERSION}_$ARCH.deb"

ci/build/nfpm.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ description: |
1010
vendor: "Coder"
1111
homepage: "https://github.com/cdr/code-server"
1212
license: "MIT"
13-
bindir: "/usr/bin"
1413
files:
1514
./ci/build/code-server-nfpm.sh: /usr/bin/code-server
1615
./ci/build/code-server.service: /usr/lib/systemd/user/code-server.service

0 commit comments

Comments
 (0)