From 27fcd9c58feefc3c42d0ca51fc4647a1b2128bb0 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 2 Oct 2017 14:49:42 -0400
Subject: [PATCH] win no longer requires mssql volume

---
 .../{docker-compose.linux.yml => docker-compose.linwin.yml} | 0
 .../{docker-compose.macwin.yml => docker-compose.mac.yml}   | 0
 scripts/bitwarden.ps1                                       | 2 +-
 scripts/bitwarden.sh                                        | 4 ++--
 scripts/run.ps1                                             | 6 +++---
 scripts/run.sh                                              | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename docker/{docker-compose.linux.yml => docker-compose.linwin.yml} (100%)
 rename docker/{docker-compose.macwin.yml => docker-compose.mac.yml} (100%)

diff --git a/docker/docker-compose.linux.yml b/docker/docker-compose.linwin.yml
similarity index 100%
rename from docker/docker-compose.linux.yml
rename to docker/docker-compose.linwin.yml
diff --git a/docker/docker-compose.macwin.yml b/docker/docker-compose.mac.yml
similarity index 100%
rename from docker/docker-compose.macwin.yml
rename to docker/docker-compose.mac.yml
diff --git a/scripts/bitwarden.ps1 b/scripts/bitwarden.ps1
index bfd7178cce..dda42ca044 100644
--- a/scripts/bitwarden.ps1
+++ b/scripts/bitwarden.ps1
@@ -69,7 +69,7 @@ function Download-Run-File {
 
 function Download-Docker-Files {
     Invoke-RestMethod -OutFile $dockerDir\docker-compose.yml -Uri "${githubBaseUrl}/docker/docker-compose.yml"
-    Invoke-RestMethod -OutFile $dockerDir\docker-compose.macwin.yml ` -Uri "${githubBaseUrl}/docker/docker-compose.macwin.yml"
+    Invoke-RestMethod -OutFile $dockerDir\docker-compose.linwin.yml ` -Uri "${githubBaseUrl}/docker/docker-compose.linwin.yml"
     Invoke-RestMethod -OutFile $dockerDir\global.env -Uri "${githubBaseUrl}/docker/global.env"
     Invoke-RestMethod -OutFile $dockerDir\mssql.env -Uri "${githubBaseUrl}/docker/mssql.env"
 }
diff --git a/scripts/bitwarden.sh b/scripts/bitwarden.sh
index a7066b5f05..eefb29132b 100755
--- a/scripts/bitwarden.sh
+++ b/scripts/bitwarden.sh
@@ -35,10 +35,10 @@ then
     OUTPUT=$2
 fi
 
-OS="linux"
+OS="linwin"
 if [ "$(uname)" == "Darwin" ]
 then
-    OS="macwin"
+    OS="mac"
 fi
 
 SCRIPTS_DIR="$OUTPUT/scripts"
diff --git a/scripts/run.ps1 b/scripts/run.ps1
index af580aa8e2..2073ac6d76 100644
--- a/scripts/run.ps1
+++ b/scripts/run.ps1
@@ -18,15 +18,15 @@ if($dockerDir -eq "") {
 # Functions
 
 function Docker-Compose-Up {
-    docker-compose -f ${dockerDir}\docker-compose.yml -f ${dockerDir}\docker-compose.macwin.yml up -d
+    docker-compose -f ${dockerDir}\docker-compose.yml -f ${dockerDir}\docker-compose.linwin.yml up -d
 }
 
 function Docker-Compose-Down {
-    docker-compose -f ${dockerDir}\docker-compose.yml -f ${dockerDir}\docker-compose.macwin.yml down
+    docker-compose -f ${dockerDir}\docker-compose.yml -f ${dockerDir}\docker-compose.linwin.yml down
 }
 
 function Docker-Compose-Pull {
-    docker-compose -f ${dockerDir}\docker-compose.yml -f ${dockerDir}\docker-compose.macwin.yml pull
+    docker-compose -f ${dockerDir}\docker-compose.yml -f ${dockerDir}\docker-compose.linwin.yml pull
 }
 
 function Docker-Prune {
diff --git a/scripts/run.sh b/scripts/run.sh
index 2107ed2da6..f354a37cb3 100644
--- a/scripts/run.sh
+++ b/scripts/run.sh
@@ -17,10 +17,10 @@ then
     DOCKER_DIR=$3
 fi
 
-OS="linux"
+OS="linwin"
 if [ "$(uname)" == "Darwin" ]
 then
-    OS="macwin"
+    OS="mac"
 fi
 
 # Functions