diff --git a/.github/workflows/release-daily.yaml b/.github/workflows/release-daily.yaml index 55bbb43d..e6b3e8b2 100644 --- a/.github/workflows/release-daily.yaml +++ b/.github/workflows/release-daily.yaml @@ -126,6 +126,7 @@ jobs: run: | cp .dist/install-wizard/install.sh build/installer cp build/installer/install.sh build/installer/publicInstaller.sh + cp .dist/install-wizard/install.ps1 build/installer - name: Release public files uses: softprops/action-gh-release@v1 @@ -136,6 +137,7 @@ jobs: install-wizard-v${{ steps.vars.outputs.tag_version }}.tar.gz build/installer/publicInstaller.sh build/installer/install.sh + build/installer/install.ps1 build/installer/publicAddnode.sh build/installer/version.hint build/installer/publicRestoreInstaller.sh diff --git a/build/installer/install.ps1 b/build/installer/install.ps1 index 3d068c0e..1316b909 100644 --- a/build/installer/install.ps1 +++ b/build/installer/install.ps1 @@ -2,20 +2,16 @@ $currentPath = Get-Location $architecture = $env:PROCESSOR_ARCHITECTURE $version = "#__VERSION__" -function Test-IsAdmin { - $currentUser = New-Object Security.Principal.WindowsPrincipal $([Security.Principal.WindowsIdentity]::GetCurrent()) - $currentUser.IsInRole("Administrators") -} - -if (-Not (Test-IsAdmin)) { - Write-Host "Not running as Administrator" - exit 1 +function Test-Wait { + while ($true) { + Start-Sleep -Seconds 1 + } } $process = Get-Process -Name olares-cli -ErrorAction SilentlyContinue if ($process) { - Write-Host "olares-cli.exe is running, exit." - exit 1 + Write-Host "olares-cli.exe is running, Press Ctrl+C to exit." + Test-Wait } $arch = "amd64" @@ -48,4 +44,4 @@ wsl --unregister Ubuntu *> $null Start-Sleep -Seconds 3 $arguments = @("terminus", "install", "--version", $version) Write-Host ("Preparing to start the installation of Olares {0}. Depending on your network conditions, this process may take several minutes." -f $version) -Start-Process -FilePath $cliPath -ArgumentList $arguments -Wait +Start-Process -FilePath $cliPath -ArgumentList $arguments -Wait -Verb RunAs