nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-02 00:22:50 -05:00
Code Activity

merge install into run script

Browse Source
This commit is contained in:
Kyle Spearrin
2018-05-31 13:42:00 -04:00
parent 92b08e6cf1
commit dfb5890bdf
3 changed files with 52 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/bitwarden.ps1
View File

@ -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