Skip to content

Commit

Permalink
snapcraft: quote more vars
Browse files Browse the repository at this point in the history
Signed-off-by: Simon Deziel <[email protected]>
  • Loading branch information
simondeziel committed Jul 17, 2024
1 parent 2e8cdfa commit bb70b57
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,6 @@ parts:
override-pull: |-
[ "$(uname -m)" != "x86_64" ] && [ "$(uname -m)" != "aarch64" ] && [ "$(uname -m)" != "ppc64le" ] && [ "$(uname -m)" != "s390x" ] && exit 0
craftctl default
override-build: |-
[ "$(uname -m)" != "x86_64" ] && [ "$(uname -m)" != "aarch64" ] && [ "$(uname -m)" != "ppc64le" ] && [ "$(uname -m)" != "s390x" ] && exit 0
craftctl default
Expand Down Expand Up @@ -698,7 +697,6 @@ parts:
override-pull: |-
[ "$(uname -m)" != "x86_64" ] && [ "$(uname -m)" != "aarch64" ] && [ "$(uname -m)" != "ppc64le" ] && [ "$(uname -m)" != "s390x" ] && exit 0
craftctl default
override-build: |-
[ "$(uname -m)" != "x86_64" ] && [ "$(uname -m)" != "aarch64" ] && [ "$(uname -m)" != "ppc64le" ] && [ "$(uname -m)" != "s390x" ] && exit 0
craftctl default
Expand Down Expand Up @@ -819,10 +817,8 @@ parts:
override-pull: |-
[ "$(uname -m)" != "x86_64" ] && [ "$(uname -m)" != "aarch64" ] && [ "$(uname -m)" != "ppc64le" ] && [ "$(uname -m)" != "s390x" ] && exit 0
craftctl default
override-build: |-
[ "$(uname -m)" != "x86_64" ] && [ "$(uname -m)" != "aarch64" ] && [ "$(uname -m)" != "ppc64le" ] && [ "$(uname -m)" != "s390x" ] && exit 0
set -ex
# Mangle the configure a bit
QEMUARCH="$(uname -m)"
Expand Down Expand Up @@ -1456,7 +1452,7 @@ parts:
set -ex
# Setup build environment
export GOPATH=$(realpath ./.go)
export GOPATH="$(realpath ./.go)"
# Setup the GOPATH
rm -Rf "${GOPATH}"
Expand All @@ -1474,7 +1470,7 @@ parts:
git config user.name "LXD snap builder"
# Setup build environment
export GOPATH=$(realpath ./.go)
export GOPATH="$(realpath ./.go)"
export CGO_CFLAGS="-I${CRAFT_STAGE}/include/ -I${CRAFT_STAGE}/usr/local/include/"
export CGO_LDFLAGS="-L${CRAFT_STAGE}/lib/ -L${CRAFT_STAGE}/usr/local/lib/"
export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)"
Expand Down Expand Up @@ -1550,15 +1546,15 @@ parts:
set -ex
# Setup build environment
export GOPATH=$(realpath ./.go)
export GOPATH="$(realpath ./.go)"
# Download the dependencies
go get -d -v ./...
override-build: |
set -ex
# Setup build environment
export GOPATH=$(realpath ./.go)
export GOPATH="$(realpath ./.go)"
export CGO_CFLAGS="-I${CRAFT_STAGE}/include/ -I${CRAFT_STAGE}/usr/local/include/"
export CGO_LDFLAGS="-L${CRAFT_STAGE}/lib/ -L${CRAFT_STAGE}/usr/local/lib/"
Expand Down

0 comments on commit bb70b57

Please sign in to comment.