From d2377d0f84d96320d66f1227e20137f1b35d2828 Mon Sep 17 00:00:00 2001 From: Reliacon Developer <51715388+reliacon-dev@users.noreply.github.com> Date: Thu, 3 Mar 2022 12:28:02 -0600 Subject: [PATCH 1/2] Update bitwarden.sh path (#127) * Update bitwarden.sh path * Update update-bitwarden.sh Co-authored-by: Alex Pearce --- build.sh | 2 +- update-bitwarden.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 6602970..823e77f 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ DIR=`dirname "$0"` DIR=`exec 2>/dev/null;(cd -- "$DIR") && cd -- "$DIR"|| cd "$DIR"; unset PWD; /usr/bin/pwd || /bin/pwd || pwd` -BW_VERSION="$(curl --silent https://raw.githubusercontent.com/bitwarden/server/master/scripts/bitwarden.sh | grep 'COREVERSION="' | sed 's/^[^"]*"//; s/".*//')" +BW_VERSION="$(curl --silent https://raw.githubusercontent.com/bitwarden/self-host/master/bitwarden.sh | grep 'COREVERSION="' | sed 's/^[^"]*"//; s/".*//')" echo "Building BitBetter for BitWarden version $BW_VERSION" diff --git a/update-bitwarden.sh b/update-bitwarden.sh index 691a243..900ee68 100755 --- a/update-bitwarden.sh +++ b/update-bitwarden.sh @@ -9,7 +9,7 @@ ask () { } SCRIPT_BASE="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -BW_VERSION="$(curl --silent https://raw.githubusercontent.com/bitwarden/server/master/scripts/bitwarden.sh | grep 'COREVERSION="' | sed 's/^[^"]*"//; s/".*//')" +BW_VERSION="$(curl --silent https://raw.githubusercontent.com/bitwarden/self-host/master/bitwarden.sh | grep 'COREVERSION="' | sed 's/^[^"]*"//; s/".*//')" echo "Starting Bitwarden update, newest server version: $BW_VERSION" From 50cdb10b2c66e415b031c826d62304c664cf2e05 Mon Sep 17 00:00:00 2001 From: h44z Date: Mon, 21 Mar 2022 21:20:32 +0100 Subject: [PATCH 2/2] Fix #128 (#129) Fix #128 --- update-bitwarden.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update-bitwarden.sh b/update-bitwarden.sh index 900ee68..e4bc938 100755 --- a/update-bitwarden.sh +++ b/update-bitwarden.sh @@ -71,7 +71,7 @@ cd $BITWARDEN_BASE ./bitwarden.sh updateself # Update the bitwarden.sh: automatically patch run.sh to fix docker-compose pull errors for private images -awk '1;/function downloadRunFile/{c=6}c&&!--c{print "sed -i '\''s/docker-compose pull/docker-compose pull --ignore-pull-failures || true/g'\'' $SCRIPTS_DIR/run.sh"}' $BITWARDEN_BASE/bitwarden.sh > tmp_bw.sh && mv tmp_bw.sh $BITWARDEN_BASE/bitwarden.sh +awk '1;/function downloadRunFile/{c=6}c&&!--c{print "sed -i '\''s/dccmd pull/dccmd pull --ignore-pull-failures || true/g'\'' $SCRIPTS_DIR/run.sh"}' $BITWARDEN_BASE/bitwarden.sh > tmp_bw.sh && mv tmp_bw.sh $BITWARDEN_BASE/bitwarden.sh chmod +x $BITWARDEN_BASE/bitwarden.sh echo "Patching bitwarden.sh completed..."