diff --git a/scripts/install.ps1 b/scripts/install.ps1 index b3dabe9114..04b6aa6c45 100644 --- a/scripts/install.ps1 +++ b/scripts/install.ps1 @@ -9,18 +9,24 @@ if(!(Test-Path -Path $outputDir )){ } [string]$letsEncrypt = "n" -[string]$domain = $( Read-Host "(!) Enter the domain name for your bitwarden instance (ex. bitwarden.company.com)" ) +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") { - $letsEncrypt = $( Read-Host "(!) Do you want to use Let's Encrypt to generate a free SSL certificate? (y/n)" ) + 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") { - [string]$email = $( Read-Host "(!) Enter your email address (Let's Encrypt will send you certificate expiration reminders)" ) - + 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 @@ -36,4 +42,6 @@ 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/install.sh b/scripts/install.sh index dcf358f5d0..79900b2628 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -1,6 +1,9 @@ #!/usr/bin/env bash set -e +CYAN='\033[0;36m' +NC='\033[0m' # No Color + OUTPUT_DIR="../." if [ $# -gt 0 ] then @@ -28,7 +31,9 @@ fi mkdir -p $OUTPUT_DIR LETS_ENCRYPT="n" -read -p "(!) Enter the domain name for your bitwarden instance (ex. bitwarden.company.com): " DOMAIN +echo -e -n "${CYAN}(!)${NC} Enter the domain name for your bitwarden instance (ex. bitwarden.company.com): " +read DOMAIN +echo "" if [ "$DOMAIN" == "" ] then @@ -37,11 +42,16 @@ fi if [ "$DOMAIN" != "localhost" ] then - read -p "(!) Do you want to use Let's Encrypt to generate a free SSL certificate? (y/n): " LETS_ENCRYPT + echo -e -n "${CYAN}(!)${NC} Do you want to use Let's Encrypt to generate a free SSL certificate? (y/n): " LETS_ENCRYPT + read LETS_ENCRYPT + echo "" if [ "$LETS_ENCRYPT" == "y" ] then - read -p "(!) Enter your email address (Let's Encrypt will send you certificate expiration reminders): " EMAIL + echo -e -n "${CYAN}(!)${NC} Enter your email address (Let's Encrypt will send you certificate expiration reminders): " EMAIL + read EMAIL + echo "" + mkdir -p $OUTPUT_DIR/letsencrypt docker pull certbot/certbot docker run -it --rm --name certbot -p 80:80 -v $OUTPUT_DIR/letsencrypt:/etc/letsencrypt/ certbot/certbot \ @@ -62,3 +72,4 @@ fi echo "" echo "Setup complete" +echo ""