Merge 7007356b9b into 29add24126

build.ps1

@@ -27,6 +27,7 @@ if (Test-Path "$pwd\.keys\cert.cert" -PathType Leaf) {
 	Rename-Item -Path "$pwd\.keys\cert.cert" -NewName "$pwd\.keys\cert.cer"
 }
 
+
 # generate keys if none are available
 if (!(Test-Path "$pwd\.keys" -PathType Container)) {
 	.\generateKeys.ps1
@@ -39,7 +40,7 @@ Copy-Item "$pwd\.keys\cert.cer" -Destination "$pwd\src\bitBetter"
 docker build --no-cache -t bitbetter/bitbetter "$pwd\src\bitBetter"
 Remove-Item "$pwd\src\bitBetter\cert.cer" -Force
 
-# gather all running instances, cannot run a wildcard filter on Ancestor= :(, does find all where name = *bitwarden*
+# gather all running instances, cannot run a wildcard filter on Ancestor= :(
 $oldinstances = docker container ps --all -f Name=bitwarden --format '{{.ID}}'
 
 # stop and remove all running instances

build.sh

@@ -40,7 +40,7 @@ cp -f "$PWD/.keys/cert.cer" "$PWD/src/bitBetter"
 docker build --no-cache -t bitbetter/bitbetter "$PWD/src/bitBetter"
 rm -f "$PWD/src/bitBetter/cert.cer"
 
-# gather all running instances, cannot run a wildcard filter on Ancestor= :(, does find all where name = *bitwarden*
+# gather all running instances, cannot run a wildcard filter on Ancestor= :(
 OLDINSTANCES=$(docker container ps --all -f Name=bitwarden --format '{{.ID}}')
 
 # stop and remove all running instances
@@ -53,8 +53,10 @@ done
 if [ "$1" = "update" ]; then
 	docker pull ghcr.io/bitwarden/self-host:beta
 else
-	read -p "Update (or get) bitwarden source container (y/n): "
-	if [[ $REPLY =~ ^[Yy]$ ]]; then
+	read -p "Update (or get) bitwarden source container (y/n): " -n 1 -r
+	echo
+	if [[ $REPLY =~ ^[Yy]$ ]]
+	then
 		docker pull ghcr.io/bitwarden/self-host:beta
 	fi
 fi