From 358d8e0b50acc58ed3bc9a782f8ebfceed47d68f Mon Sep 17 00:00:00 2001
From: Thomas Meckel <tmeckel@noreply.users.github.com>
Date: Sat, 21 Sep 2019 14:38:46 +0200
Subject: [PATCH] Made build.sh more robust

---
 build.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/build.sh b/build.sh
index 00763aa..5ee9b45 100755
--- a/build.sh
+++ b/build.sh
@@ -5,15 +5,21 @@ set -e
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 SRC="$DIR/git"
 DST="$DIR/dist"
-if [ -z "$1" ]; then REF="master"; else REF="$1"; fi
+if [ -z "$1" ]; then REF="1.10.0"; else REF="$1"; fi
 
 # Clone bitwarden_rs
 if [ ! -d "$SRC" ]; then
   git clone https://github.com/dani-garcia/bitwarden_rs.git "$SRC"
 fi
 cd "$SRC" || exit
-git fetch
-git checkout "$REF"
+CREF="$(git branch | grep \* | cut -d ' ' -f2)"
+if [ "$CREF" != "$REF" ]; then
+  git fetch
+  git checkout "$REF" --force
+else
+  git clean -d -f
+  git pull
+fi
 cd - || exit
 
 # Prepare EnvFile
@@ -25,7 +31,7 @@ sed -i "s#\# WEB_VAULT_FOLDER=web-vault/#WEB_VAULT_FOLDER=/usr/share/bitwarden_r
 mkdir -p "$DST"
 
 # Prepare Dockerfile
-patch -i "$DIR/Dockerfile.patch" "$SRC/docker/amd64/sqlite/Dockerfile" -o "$DIR/Dockerfile"
+patch -i "$DIR/Dockerfile.patch" "$SRC/docker/amd64/sqlite/Dockerfile" -o "$DIR/Dockerfile" || exit
 
 docker build -t bitwarden-deb "$DIR"