From 9057815041b8223cc6e67a5bf18c11eacd173c8e Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Sat, 19 Aug 2017 21:45:13 -0400
Subject: [PATCH] bash script updates

---
 scripts/bitwarden.sh | 70 ++++++++++++++++++++++++++++++++------------
 scripts/install.sh   |  4 +--
 scripts/run-mac.sh   | 11 -------
 scripts/run.sh       | 13 ++++++--
 scripts/update-db.sh |  2 +-
 5 files changed, 65 insertions(+), 35 deletions(-)
 delete mode 100644 scripts/run-mac.sh

diff --git a/scripts/bitwarden.sh b/scripts/bitwarden.sh
index dc886d825..796ce8617 100644
--- a/scripts/bitwarden.sh
+++ b/scripts/bitwarden.sh
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 set -e
 
-YEAR=$(date +'%Y')
-
 cat << "EOF"
  _     _ _                         _            
 | |__ (_) |___      ____ _ _ __ __| | ___ _ __  
@@ -14,44 +12,78 @@ EOF
 
 cat << EOF
 Open source password management solutions
-Copyright 2015-$YEAR, 8bit Solutions LLC
+Copyright 2015-$(date +'%Y'), 8bit Solutions LLC
 https://bitwarden.com, https://github.com/bitwarden
 
 EOF
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-DOCKER_DIR="./docker"
-GITHUB_BASE_URL="https://raw.githubusercontent.com/bitwarden/core/master"
-OUTPUT=~/bitwarden
+OS="linux"
 if [ $# -eq 2 ]
 then
-    OUTPUT=$2
+    if [ $2 == "mac" -o $2 == "linux" ]
+    then
+        OS=$2
+    fi
 fi
 
-function dowloadRunFiles {
-    curl -s -o run.sh $GITHUB_BASE_URL/scripts/run.ps1
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+OUTPUT="$DIR/bitwarden"
+if [ $# -eq 3 ]
+then
+    OUTPUT=$3
+fi
+
+if [ ! -d "$OUTPUT" ]
+then
+    mkdir $OUTPUT
+fi
+
+SCRIPTS_DIR="$OUTPUT/scripts"
+DOCKER_DIR="$SCRIPTS_DIR/docker"
+GITHUB_BASE_URL="https://raw.githubusercontent.com/bitwarden/core/master"
+
+if [ ! -d "$SCRIPTS_DIR" ]
+then
+    mkdir $SCRIPTS_DIR
+fi
+
+function downloadRunFiles() {
+    curl -s -o $SCRIPTS_DIR/run.sh $GITHUB_BASE_URL/scripts/run.ps1
     curl -s -o $DOCKER_DIR/docker-compose.yml $GITHUB_BASE_URL/docker/docker-compose.yml
-    curl -s -o $DOCKER_DIR/docker-compose.linux.yml $GITHUB_BASE_URL/docker/docker-compose.linux.yml
+    curl -s -o $DOCKER_DIR/docker-compose.$OS.yml $GITHUB_BASE_URL/docker/docker-compose.$OS.yml
     curl -s -o $DOCKER_DIR/global.env $GITHUB_BASE_URL/docker/global.env
     curl -s -o $DOCKER_DIR/mssql.env $GITHUB_BASE_URL/docker/mssql.env
 }
 
 if [ $1 == 'install' ]
 then
-    curl -s -o install.sh $GITHUB_BASE_URL/scripts/install.sh
-    chmod u+x install.sh
-    ./install.sh $OUTPUT
+    curl -s -o $SCRIPTS_DIR/install.sh $GITHUB_BASE_URL/scripts/install.sh
+    chmod u+x $SCRIPTS_DIR/install.sh
+    $SCRIPTS_DIR/install.sh $OUTPUT
 elif [ $1 == 'run' -o $1 == 'restart' ]
 then
-    #
+    if [ ! -d "$DOCKER_DIR" ]
+    then
+        mkdir $DOCKER_DIR
+        downloadRunFiles
+    fi
+    chmod u+x $SCRIPTS_DIR/run.sh
+    $SCRIPTS_DIR/run.sh $DOCKER_DIR $OS
 elif [ $1 == 'update' ]
 then
-    #
+    if [ -d "$DOCKER_DIR" ]
+    then
+        rm -rf $DOCKER_DIR
+    fi
+
+    mkdir $DOCKER_DIR
+    downloadRunFiles
+    $SCRIPTS_DIR/run.sh $DOCKER_DIR $OS
 elif [ $1 == 'updatedb' ]
 then
-    curl -s -o update-db.sh $GITHUB_BASE_URL/scripts/update-db.sh
-    chmod u+x update-db.sh
-    ./update-db.sh $OUTPUT
+    curl -s -o $SCRIPTS_DIR/update-db.sh $GITHUB_BASE_URL/scripts/update-db.sh
+    chmod u+x $SCRIPTS_DIR/update-db.sh
+    $SCRIPTS_DIR/update-db.sh $OUTPUT
 else
     echo "No command found."
 fi
diff --git a/scripts/install.sh b/scripts/install.sh
index 89d378e6c..896c7e159 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -4,7 +4,7 @@ set -e
 docker --version
 echo ""
 
-OUTPUT_DIR=~/bitwarden
+OUTPUT_DIR="../."
 if [ $# -eq 1 ]
 then
     OUTPUT_DIR=$1
@@ -14,7 +14,7 @@ mkdir -p $OUTPUT_DIR
 read -p "(!) Enter the domain name for your bitwarden instance (ex. bitwarden.company.com): " DOMAIN
 read -p "(!) Do you want to use Let's Encrypt to generate a free SSL certificate? (y/n): " LETS_ENCRYPT
 
-if [ $LETS_ENCRYPT == 'y' ]
+if [ $LETS_ENCRYPT == "y" ]
 then
     read -p "(!) Enter your email address (Let's Encrypt will send you certificate expiration reminders): " EMAIL
     mkdir -p $OUTPUT_DIR/letsencrypt/live/$DOMAIN
diff --git a/scripts/run-mac.sh b/scripts/run-mac.sh
deleted file mode 100644
index 094b68449..000000000
--- a/scripts/run-mac.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-DOCKER_DIR=$DIR/../docker
-
-docker --version
-docker-compose --version
-
-docker-compose -f $DOCKER_DIR/docker-compose.yml -f $DOCKER_DIR/docker-compose.mac.yml down
-docker-compose -f $DOCKER_DIR/docker-compose.yml -f $DOCKER_DIR/docker-compose.mac.yml up -d
diff --git a/scripts/run.sh b/scripts/run.sh
index 77f3f0488..1b3ce1d3c 100644
--- a/scripts/run.sh
+++ b/scripts/run.sh
@@ -3,9 +3,18 @@ set -e
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 DOCKER_DIR=$DIR/../docker
+OS="linux"
+if [ $# -eq 1 ]
+then
+    DOCKER_DIR=$1
+fi
+if [ $# -eq 2 ]
+then
+    OS=$2
+fi
 
 docker --version
 docker-compose --version
 
-docker-compose -f $DOCKER_DIR/docker-compose.yml -f $DOCKER_DIR/docker-compose.linux.yml down
-docker-compose -f $DOCKER_DIR/docker-compose.yml -f $DOCKER_DIR/docker-compose.linux.yml up -d
+docker-compose -f $DOCKER_DIR/docker-compose.yml -f $DOCKER_DIR/docker-compose.$OS.yml down
+docker-compose -f $DOCKER_DIR/docker-compose.yml -f $DOCKER_DIR/docker-compose.$OS.yml up -d
diff --git a/scripts/update-db.sh b/scripts/update-db.sh
index b87f90e3d..893ad4280 100644
--- a/scripts/update-db.sh
+++ b/scripts/update-db.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -e
 
-OUTPUT_DIR=~/bitwarden
+OUTPUT_DIR="../."
 if [ $# -eq 1 ]
 then
     OUTPUT_DIR=$1