From 1d2da77f1b221d0cda5c68621921cf7f76c5163d Mon Sep 17 00:00:00 2001
From: Pascal <pascal.pothmann@gmail.com>
Date: Tue, 26 Jan 2021 09:51:38 +0100
Subject: [PATCH] changed script to be runnable by bash 3.x & README entry
 edited

---
 README.md           | 11 +++++++++++
 update-bitwarden.sh | 12 ++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index d8e4f87..887a12f 100644
--- a/README.md
+++ b/README.md
@@ -83,6 +83,16 @@ openssl pkcs12 -export -out cert.pfx -inkey key.pem -in cert.pem -passin pass:te
 
 To update Bitwarden, the provided `update-bitwarden.sh` script can be used. It will rebuild the BitBetter images and automatically update Bitwarden afterwards. Docker pull errors can be ignored for api and identity images.
 
+You can either run this script without providing any parameters in interactive mode (`./update-bitwarden.sh`) or by setting the parameters as follows, to run the script in non-interactive mode:
+```bash
+./update-bitwarden.sh param1 param2 param3
+```
+`param1`: The path to the directory containing your bwdata directory
+
+`param2`: If you want the docker-compose file to be overwritten (either `y` or `n`)
+
+`param3`: If you want the bitbetter images to be rebuild (either `y` or `n`)
+
 ## Generating Signed Licenses
 
 There is a tool included in the directory `src/licenseGen/` that will generate new individual and organization licenses. These licenses will be accepted by the modified Bitwarden because they will be signed by the certificate you generated in earlier steps.
@@ -141,3 +151,4 @@ In the past we have done so but they were not focused on the type of customer th
 <a name="#f1"><sup>1</sup></a> If you wish to change this you'll need to change the value that `src/licenseGen/Program.cs` uses for its `GenerateUserLicense` and `GenerateOrgLicense` calls. Remember, this is really unnecessary as this certificate does not represent any type of security-related certificate.
 
 <a name="#f2"><sup>2</sup></a>This tool builds on top of the `bitbetter/api` container image so make sure you've built that above using the root `./build.sh` script.
+
diff --git a/update-bitwarden.sh b/update-bitwarden.sh
index 4f52f7e..b6c35b0 100755
--- a/update-bitwarden.sh
+++ b/update-bitwarden.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
-ask()
-{
-  declare -g $1="$2"
-  if [ -z "${!1}" ]; then
-    echo "$3"
-    read $1
+ask () {
+  local __resultVar=$1
+  local __result="$2"
+  if [ -z "$2" ]; then
+    read -p "$3" __result
   fi
+  eval $__resultVar="'$__result'"
 }
 
 SCRIPT_BASE="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"