diff --git a/.gitignore b/.gitignore index a7210e0..555fb57 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -git -build/ +git/ +dist/ diff --git a/build.sh b/build.sh index f25a2ab..a8c8048 100755 --- a/build.sh +++ b/build.sh @@ -2,15 +2,21 @@ set -e -if [ -d "$1/git" ]; then - cd "$1/git" || exit +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +SRC="$DIR/git" +DST="$DIR/dist" + +if [ -d "$SRC" ]; then + cd "$SRC" || exit git pull cd - || exit else - git clone https://github.com/dani-garcia/bitwarden_rs.git "$1/git" + git clone https://github.com/dani-garcia/bitwarden_rs.git "$SRC" fi -docker build -t bitwarden-deb "$1" +mkdir -p "$DST" + +docker build -t bitwarden-deb "$DIR" + CID=$(docker run -d bitwarden-deb) -mkdir -p "$1/build" -docker cp "$CID":/bitwarden_package/bitwarden-rs.deb "$1/build" +docker cp "$CID":/bitwarden_package/bitwarden-rs.deb "$DST" docker rm "$CID"