Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-02-16 01:51:21 +01:00
Code Issues Projects Releases Wiki Activity

allow bwdata to exist for loading ca-certs

Browse Source
This commit is contained in:
Kyle Spearrin 2018-07-26 15:29:46 -04:00
parent 6e92364475
commit 91765477c5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/bitwarden.ps1
View File

@ -65,7 +65,7 @@ function Check-Output-Dir-Exists {
} }
function Check-Output-Dir-Not-Exists { function Check-Output-Dir-Not-Exists {
if (Test-Path -Path $output) { if (Test-Path -Path "$output\docker") {
throw "Looks like Bitwarden is already installed at $output." throw "Looks like Bitwarden is already installed at $output."
} }
} }
@ -74,7 +74,7 @@ function Check-Output-Dir-Not-Exists {
if ($install) { if ($install) {
Check-Output-Dir-Not-Exists Check-Output-Dir-Not-Exists
New-Item -ItemType directory -Path $output | Out-Null New-Item -ItemType directory -Path $output -ErrorAction Ignore | Out-Null
Download-Run-File Download-Run-File
Invoke-Expression "$scriptsDir\run.ps1 -install -outputDir $output -coreVersion $coreVersion -webVersion $webVersion" Invoke-Expression "$scriptsDir\run.ps1 -install -outputDir $output -coreVersion $coreVersion -webVersion $webVersion"
} }

4
scripts/bitwarden.sh
View File

@ -66,7 +66,7 @@ function checkOutputDirExists() {
} }
function checkOutputDirNotExists() { function checkOutputDirNotExists() {
if [ -d "$OUTPUT" ] if [ -d "$OUTPUT/docker" ]
then then
echo "Looks like Bitwarden is already installed at $OUTPUT." echo "Looks like Bitwarden is already installed at $OUTPUT."
exit 1 exit 1
@ -78,7 +78,7 @@ function checkOutputDirNotExists() {
if [ "$1" == "install" ] if [ "$1" == "install" ]
then then
checkOutputDirNotExists checkOutputDirNotExists
mkdir $OUTPUT mkdir -p $OUTPUT
downloadRunFile downloadRunFile
$SCRIPTS_DIR/run.sh install $OUTPUT $COREVERSION $WEBVERSION $SCRIPTS_DIR/run.sh install $OUTPUT $COREVERSION $WEBVERSION
elif [ "$1" == "start" -o "$1" == "restart" ] elif [ "$1" == "start" -o "$1" == "restart" ]