bbohard
/
bitwarden_rs-debian
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Made build.sh more robust

This commit is contained in:
Thomas Meckel 2019-09-21 14:38:46 +02:00 committed by greizgh
parent 101380b195
commit 358d8e0b50
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build.sh
View File

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