From 3c52cc90821fd3ffb49e7dad692064ba1b6c46e0 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 30 Aug 2018 16:25:33 -0400
Subject: [PATCH] rebuild command added

---
 scripts/bitwarden.ps1 |  5 +++++
 scripts/bitwarden.sh  |  4 ++++
 scripts/run.ps1       | 12 +++++++++---
 scripts/run.sh        | 11 +++++++++--
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/scripts/bitwarden.ps1 b/scripts/bitwarden.ps1
index 42fa8d7923..c7c24b5807 100644
--- a/scripts/bitwarden.ps1
+++ b/scripts/bitwarden.ps1
@@ -4,6 +4,7 @@ param (
     [switch] $restart,
     [switch] $stop,
     [switch] $update,
+    [switch] $rebuild,
     [switch] $updatedb,
     [switch] $updateself,
     [string] $output = ""
@@ -87,6 +88,10 @@ elseif ($update) {
     Download-Run-File
     Invoke-Expression "$scriptsDir\run.ps1 -update -outputDir $output -coreVersion $coreVersion -webVersion $webVersion"
 }
+elseif ($rebuild) {
+    Check-Output-Dir-Exists
+    Invoke-Expression "$scriptsDir\run.ps1 -rebuild -outputDir $output -coreVersion $coreVersion -webVersion $webVersion"
+}
 elseif ($updatedb) {
     Check-Output-Dir-Exists
     Invoke-Expression "$scriptsDir\run.ps1 -updatedb -outputDir $output -coreVersion $coreVersion -webVersion $webVersion"
diff --git a/scripts/bitwarden.sh b/scripts/bitwarden.sh
index 0776e6b41e..39da287bfc 100755
--- a/scripts/bitwarden.sh
+++ b/scripts/bitwarden.sh
@@ -90,6 +90,10 @@ then
     checkOutputDirExists
     downloadRunFile
     $SCRIPTS_DIR/run.sh update $OUTPUT $COREVERSION $WEBVERSION
+elif [ "$1" == "rebuild" ]
+then
+    checkOutputDirExists
+    $SCRIPTS_DIR/run.sh rebuild $OUTPUT $COREVERSION $WEBVERSION
 elif [ "$1" == "updatedb" ]
 then
     checkOutputDirExists
diff --git a/scripts/run.ps1 b/scripts/run.ps1
index 257599176f..18c009e0f9 100644
--- a/scripts/run.ps1
+++ b/scripts/run.ps1
@@ -108,8 +108,10 @@ function Update-Database {
     echo "Database update complete"
 }
 
-function Update {
-    Pull-Setup
+function Update([switch] $withpull) {
+    if ($withpull) {
+        Pull-Setup
+    }
     docker run -it --rm --name setup -v ${outputDir}:/bitwarden bitwarden/setup:$coreVersion `
         dotnet Setup.dll -update 1 -os win -corev $coreVersion -webv $webVersion
 }
@@ -152,9 +154,13 @@ elseif ($updatedb) {
 }
 elseif ($update) {
     Docker-Compose-Down
-    Update
+    Update -withpull
     Restart
     echo "Pausing 60 seconds for database to come online. Please wait..."
     Start-Sleep -s 60
     Update-Database
 }
+elseif ($rebuild) {
+    Docker-Compose-Down
+    Update
+}
diff --git a/scripts/run.sh b/scripts/run.sh
index 7290a35d11..a5fa37e20c 100644
--- a/scripts/run.sh
+++ b/scripts/run.sh
@@ -152,7 +152,10 @@ function updateDatabase() {
 }
 
 function update() {
-    pullSetup
+    if [ "$1" == "withpull" ]
+    then
+        pullSetup
+    fi
     docker run -i --rm --name setup -v $OUTPUT_DIR:/bitwarden \
         --env-file $ENV_DIR/uid.env bitwarden/setup:$COREVERSION \
         dotnet Setup.dll -update 1 -os $OS -corev $COREVERSION -webv $WEBVERSION
@@ -198,9 +201,13 @@ then
 elif [ "$1" == "update" ]
 then
     dockerComposeDown
-    update
+    update withpull
     restart
     echo "Pausing 60 seconds for database to come online. Please wait..."
     sleep 60
     updateDatabase
+elif [ "$1" == "rebuild" ]
+then
+    dockerComposeDown
+    update nopull
 fi