From bfeb39f51000e332d5aa4987c9d1cb1e3d40eb69 Mon Sep 17 00:00:00 2001
From: Danny Moesch <danny.moesch@icloud.com>
Date: Mon, 19 Aug 2019 23:40:17 +0200
Subject: [PATCH] Polish build script

---
 gopenpgp_build.sh | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/gopenpgp_build.sh b/gopenpgp_build.sh
index 13ec7f3..872762f 100755
--- a/gopenpgp_build.sh
+++ b/gopenpgp_build.sh
@@ -1,30 +1,24 @@
 #!/bin/bash
 
-OLDGOPATH=$GOPATH
-OLDPATH=$PATH
+set -euox pipefail
 
-mkdir go
-export GOPATH=$(pwd)/go
+export GOPATH="$(pwd)/go"
+export PATH="$PATH:$GOPATH/bin"
 
-go get -u golang.org/x/mobile/cmd/gomobile
+go get -u golang.org/x/mobile/cmd/gomobile || true
+go get golang.org/x/tools/go/packages || true
 go install golang.org/x/mobile/cmd/gobind
-go get golang.org/x/mobile
+go get golang.org/x/mobile || true
+go get -u github.com/ProtonMail/gopenpgp || true
 
-go get -u github.com/ProtonMail/gopenpgp
+PACKAGE_PATH="github.com/ProtonMail/gopenpgp"
 
-cd $GOPATH/src/github.com/ProtonMail/gopenpgp
+( cd "$GOPATH/src/$PACKAGE_PATH" && GO111MODULE=on go mod vendor )
 
-GO111MODULE=on go mod vendor
+OUTPUT_PATH="$GOPATH/dist"
+mkdir -p "$OUTPUT_PATH"
 
-cd $GOPATH
-export PATH=$PATH:$GOPATH/bin
-mkdir dist
+chmod -R u+w "$GOPATH/pkg/mod"
 
-OUTPUT_PATH="dist"
-PACKAGE_PATH=github.com/ProtonMail/gopenpgp
-
-$GOPATH/bin/gomobile bind -target ios -o ${OUTPUT_PATH}/Crypto.framework $PACKAGE_PATH/crypto $PACKAGE_PATH/armor $PACKAGE_PATH/constants $PACKAGE_PATH/models $PACKAGE_PATH/subtle
-
-
-export GOPATH=$OLDGOPATH
-export PATH=$OLDPATH
+"$GOPATH/bin/gomobile" bind -target ios -o "${OUTPUT_PATH}/Crypto.framework" \
+    "$PACKAGE_PATH"/{crypto,armor,constants,models,subtle}