From dfb5890bdf08902d77ddc7283905787db7ce4f99 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 31 May 2018 13:42:00 -0400
Subject: [PATCH] merge install into run script

---
 scripts/bitwarden.ps1 | 10 +-------
 scripts/install.ps1   | 47 -------------------------------------
 scripts/run.ps1       | 54 ++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 52 insertions(+), 59 deletions(-)
 delete mode 100644 scripts/install.ps1

diff --git a/scripts/bitwarden.ps1 b/scripts/bitwarden.ps1
index b6a6def148..430b10d18a 100644
--- a/scripts/bitwarden.ps1
+++ b/scripts/bitwarden.ps1
@@ -51,13 +51,6 @@ function Download-Self {
     Invoke-RestMethod -OutFile $scriptPath -Uri "${githubBaseUrl}/scripts/bitwarden.ps1"
 }
 
-function Download-Install {
-    if(!(Test-Path -Path $scriptsDir)) {
-        New-Item -ItemType directory -Path $scriptsDir | Out-Null
-    }
-    Invoke-RestMethod -OutFile $scriptsDir\install.ps1 ` -Uri "${githubBaseUrl}/scripts/install.ps1"
-}
-
 function Download-Run-File {
     if(!(Test-Path -Path $scriptsDir)) {
         New-Item -ItemType directory -Path $scriptsDir | Out-Null
@@ -82,9 +75,8 @@ function Check-Output-Dir-Not-Exists {
 if($install) {
     Check-Output-Dir-Not-Exists
     New-Item -ItemType directory -Path $output | Out-Null
-    Download-Install
     Download-Run-File
-    Invoke-Expression "$scriptsDir\install.ps1 -outputDir $output -coreVersion $coreVersion -webVersion $webVersion"
+    Invoke-Expression "$scriptsDir\run.ps1 -install -outputDir $output -coreVersion $coreVersion -webVersion $webVersion"
 }
 elseif($start -Or $restart) {
     Check-Output-Dir-Exists
diff --git a/scripts/install.ps1 b/scripts/install.ps1
deleted file mode 100644
index 04b6aa6c45..0000000000
--- a/scripts/install.ps1
+++ /dev/null
@@ -1,47 +0,0 @@
-param (
-    [string]$outputDir = "../.",
-    [string]$coreVersion = "latest",
-    [string]$webVersion = "latest"
-)
-
-if(!(Test-Path -Path $outputDir )){
-    New-Item -ItemType directory -Path $outputDir | Out-Null
-}
-
-[string]$letsEncrypt = "n"
-Write-Host "(!) " -f cyan -nonewline
-[string]$domain = $( Read-Host "Enter the domain name for your bitwarden instance (ex. bitwarden.company.com)" )
-echo ""
-
-if($domain -eq "") {
-    $domain = "localhost"
-}
-
-if($domain -ne "localhost") {
-    Write-Host "(!) " -f cyan -nonewline
-    $letsEncrypt = $( Read-Host "Do you want to use Let's Encrypt to generate a free SSL certificate? (y/n)" )
-    echo ""
-
-    if($letsEncrypt -eq "y") {
-        Write-Host "(!) " -f cyan -nonewline
-        [string]$email = $( Read-Host "Enter your email address (Let's Encrypt will send you certificate expiration reminders)" )
-        echo ""
-
-        $letsEncryptPath = "${outputDir}/letsencrypt"
-        if(!(Test-Path -Path $letsEncryptPath )){
-            New-Item -ItemType directory -Path $letsEncryptPath | Out-Null
-        }
-        docker pull certbot/certbot
-        docker run -it --rm --name certbot -p 80:80 -v $outputDir/letsencrypt:/etc/letsencrypt/ certbot/certbot `
-            certonly --standalone --noninteractive --agree-tos --preferred-challenges http --email $email -d $domain `
-            --logs-dir /etc/letsencrypt/logs
-    }
-}
-
-docker pull bitwarden/setup:$coreVersion
-docker run -it --rm --name setup -v ${outputDir}:/bitwarden bitwarden/setup:$coreVersion `
-    dotnet Setup.dll -install 1 -domain ${domain} -letsencrypt ${letsEncrypt} -os win -corev $coreVersion -webv $webVersion
-
-echo ""
-echo "Setup complete"
-echo ""
diff --git a/scripts/run.ps1 b/scripts/run.ps1
index a646f4e4ad..067e9b1452 100644
--- a/scripts/run.ps1
+++ b/scripts/run.ps1
@@ -2,6 +2,7 @@ param (
     [string]$outputDir = "../.",
     [string]$coreVersion = "latest",
     [string]$webVersion = "latest",
+    [switch] $install,
     [switch] $start,
     [switch] $restart,
     [switch] $stop,
@@ -16,6 +17,48 @@ $dockerDir="${outputDir}\docker"
 
 # Functions
 
+function Install() {
+    [string]$letsEncrypt = "n"
+    Write-Host "(!) " -f cyan -nonewline
+    [string]$domain = $( Read-Host "Enter the domain name for your bitwarden instance (ex. bitwarden.company.com)" )
+    echo ""
+    
+    if($domain -eq "") {
+        $domain = "localhost"
+    }
+    
+    if($domain -ne "localhost") {
+        Write-Host "(!) " -f cyan -nonewline
+        $letsEncrypt = $( Read-Host "Do you want to use Let's Encrypt to generate a free SSL certificate? (y/n)" )
+        echo ""
+    
+        if($letsEncrypt -eq "y") {
+            Write-Host "(!) " -f cyan -nonewline
+            [string]$email = $( Read-Host "Enter your email address (Let's Encrypt will send you certificate " +
+                "expiration reminders)" )
+            echo ""
+    
+            $letsEncryptPath = "${outputDir}/letsencrypt"
+            if(!(Test-Path -Path $letsEncryptPath )){
+                New-Item -ItemType directory -Path $letsEncryptPath | Out-Null
+            }
+            docker pull certbot/certbot
+            docker run -it --rm --name certbot -p 80:80 -v $outputDir/letsencrypt:/etc/letsencrypt/ certbot/certbot `
+                certonly --standalone --noninteractive --agree-tos --preferred-challenges http `
+                --email $email -d $domain --logs-dir /etc/letsencrypt/logs
+        }
+    }
+    
+    Pull-Setup
+    docker run -it --rm --name setup -v ${outputDir}:/bitwarden bitwarden/setup:$coreVersion `
+        dotnet Setup.dll -install 1 -domain ${domain} -letsencrypt ${letsEncrypt} `
+        -os win -corev $coreVersion -webv $webVersion
+    
+    echo ""
+    echo "Setup complete"
+    echo ""    
+}
+
 function Docker-Compose-Up {
     if(Test-Path -Path "${dockerDir}\docker-compose.override.yml" -PathType leaf) {
         docker-compose -f ${dockerDir}\docker-compose.yml -f ${dockerDir}\docker-compose.override.yml up -d
@@ -51,14 +94,16 @@ function Docker-Prune {
 function Update-Lets-Encrypt {
     if(Test-Path -Path "${outputDir}\letsencrypt\live") {
         docker pull certbot/certbot
-        docker run -it --rm --name certbot -p 443:443 -p 80:80 -v $outputDir/letsencrypt:/etc/letsencrypt/ certbot/certbot `
+        docker run -it --rm --name certbot -p 443:443 -p 80:80 `
+            -v $outputDir/letsencrypt:/etc/letsencrypt/ certbot/certbot `
             renew --logs-dir /etc/letsencrypt/logs
     }
 }
 
 function Update-Database {
     Pull-Setup
-    docker run -it --rm --name setup --network container:bitwarden-mssql -v ${outputDir}:/bitwarden bitwarden/setup:$coreVersion `
+    docker run -it --rm --name setup --network container:bitwarden-mssql `
+        -v ${outputDir}:/bitwarden bitwarden/setup:$coreVersion `
         dotnet Setup.dll -update 1 -db 1 -os win -corev $coreVersion -webv $webVersion
     echo "Database update complete"
 }
@@ -90,7 +135,10 @@ function Pull-Setup {
 
 # Commands
 
-if($start -Or $restart) {
+if($install) {
+    Install
+}
+elseif($start -Or $restart) {
     Restart
 }
 elseif($pull) {