Quick and dirty fix (#213)

* Quick and dirty fix

* Don't push obsolete code

* Improve code
This commit is contained in:
Michiel Hazelhof 2024-11-01 15:36:03 +01:00 committed by GitHub
parent 7f64e2cd4a
commit 3ec7b3d843
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -32,8 +32,6 @@ RECREATE_OV=${tmprecreate:-$RECREATE_OV}
if [[ $RECREATE_OV =~ ^[Yy]$ ]] if [[ $RECREATE_OV =~ ^[Yy]$ ]]
then then
{ {
echo "version: '3'"
echo ""
echo "services:" echo "services:"
echo " api:" echo " api:"
echo " image: bitbetter/api:$BW_VERSION" echo " image: bitbetter/api:$BW_VERSION"
@ -71,7 +69,7 @@ cd $BITWARDEN_BASE
./bitwarden.sh updateself ./bitwarden.sh updateself
# Update the bitwarden.sh: automatically patch run.sh to fix docker-compose pull errors for private images # 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/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 sed -i 's/chmod u+x $SCRIPTS_DIR\/run.sh/chmod u+x $SCRIPTS_DIR\/run.sh\n sed -i \x27s\/dccmd pull\/dccmd pull --ignore-pull-failures || true\/g\x27 $SCRIPTS_DIR\/run.sh/g' -i $BITWARDEN_BASE/bitwarden.sh
chmod +x $BITWARDEN_BASE/bitwarden.sh chmod +x $BITWARDEN_BASE/bitwarden.sh
echo "Patching bitwarden.sh completed..." echo "Patching bitwarden.sh completed..."