gnh1201/welsonjs
1
0
Fork 0
mirror of https://github.com/gnh1201/welsonjs.git synced 2025-12-06 14:23:41 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Update installer process handling and cleanup arguments

Browse Source 
Removed unnecessary installer arguments and ensured installers run with process waiting for completion in postInstall.ps1. Cleaned up setup.iss to remove redundant 'Components' field for PowerShell execution. Minor formatting fix in DownloadUrls.psd1.
This commit is contained in:
Namhyeon, Go 2025-12-01 16:16:43 +09:00
parent 6b5a5ea08e
commit 0be5bd031d
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/DownloadUrls.psd1
View File

@ -105,7 +105,7 @@
# WinDivert # WinDivert
# =========================== # ===========================
windivert = @{ windivert = @{
x64 = "https://github.com/basil00/WinDivert/releases/download/v2.2.2/WinDivert-2.2.2-A.zip", x64 = "https://github.com/basil00/WinDivert/releases/download/v2.2.2/WinDivert-2.2.2-A.zip"
arm64 = $null # no official ARM64 build arm64 = $null # no official ARM64 build
x86 = "https://github.com/basil00/WinDivert/releases/download/v2.2.2/WinDivert-2.2.2-A.zip" x86 = "https://github.com/basil00/WinDivert/releases/download/v2.2.2/WinDivert-2.2.2-A.zip"
} }

16
postInstall.ps1
View File

@ -682,11 +682,11 @@ try {
Write-Host "[*] artifacts component not selected. Skipping installation." Write-Host "[*] artifacts component not selected. Skipping installation."
} }
# GTK3 runtime (component: gtk3runtime) – just run installer; no need to wait # GTK3 runtime (component: gtk3runtime) – run installer and wait
if (Test-ComponentSelected -Name "gtk3runtime") { if (Test-ComponentSelected -Name "gtk3runtime") {
if (Test-Path $GtkRuntimeInstaller) { if (Test-Path $GtkRuntimeInstaller) {
Write-Host "[*] Starting GTK runtime installer (no wait): $GtkRuntimeInstaller" Write-Host "[*] Running GTK runtime installer (wait): $GtkRuntimeInstaller"
Start-Process -FilePath $GtkRuntimeInstaller Start-Process -FilePath $GtkRuntimeInstaller -Wait -ErrorAction Stop
} }
else { else {
Write-Host "[WARN] GTK runtime installer not found. Skipping." Write-Host "[WARN] GTK runtime installer not found. Skipping."
@ -758,10 +758,11 @@ try {
# Nmap bundle (component: nmap) – Npcap → Nmap → VC_redist.x86.exe # Nmap bundle (component: nmap) – Npcap → Nmap → VC_redist.x86.exe
if (Test-ComponentSelected -Name "nmap") { if (Test-ComponentSelected -Name "nmap") {
# Npcap # Npcap
if (Test-Path $NpcapInstaller) { if (Test-Path $NpcapInstaller) {
Write-Host "[*] Running Npcap installer (wait): $NpcapInstaller" Write-Host "[*] Running Npcap installer (wait): $NpcapInstaller"
Start-Process -FilePath $NpcapInstaller -ArgumentList "/S" -Wait -ErrorAction Stop Start-Process -FilePath $NpcapInstaller -Wait -ErrorAction Stop
} }
else { else {
Write-Host "[WARN] Npcap installer not found. Skipping Npcap." Write-Host "[WARN] Npcap installer not found. Skipping Npcap."
@ -770,7 +771,7 @@ try {
# Nmap # Nmap
if (Test-Path $NmapInstaller) { if (Test-Path $NmapInstaller) {
Write-Host "[*] Running Nmap installer (wait): $NmapInstaller" Write-Host "[*] Running Nmap installer (wait): $NmapInstaller"
Start-Process -FilePath $NmapInstaller -ArgumentList "/S" -Wait -ErrorAction Stop Start-Process -FilePath $NmapInstaller -Wait -ErrorAction Stop
} }
else { else {
Write-Host "[WARN] Nmap installer not found. Skipping Nmap." Write-Host "[WARN] Nmap installer not found. Skipping Nmap."
@ -789,7 +790,8 @@ try {
$vcRedist = $null $vcRedist = $null
foreach ($dir in $searchDirs) { foreach ($dir in $searchDirs) {
if (Test-Path $dir) { if (Test-Path $dir) {
$candidate = Get-ChildItem -Path $dir -Filter "vc_redist.x86.exe" -Recurse -ErrorAction SilentlyContinue | Select-Object -First 1 $candidate = Get-ChildItem -Path $dir -Filter "vc_redist.x86.exe" -Recurse -ErrorAction SilentlyContinue |
Select-Object -First 1
if ($candidate) { if ($candidate) {
$vcRedist = $candidate $vcRedist = $candidate
break break
@ -799,7 +801,7 @@ try {
if ($vcRedist) { if ($vcRedist) {
Write-Host "[*] Running VC_redist.x86 installer: $($vcRedist.FullName)" Write-Host "[*] Running VC_redist.x86 installer: $($vcRedist.FullName)"
Start-Process -FilePath $vcRedist.FullName -ArgumentList "/install /quiet /norestart" -Wait -ErrorAction SilentlyContinue Start-Process -FilePath $vcRedist.FullName -Wait -ErrorAction SilentlyContinue
} }
else { else {
Write-Host "[WARN] VC_redist.x86.exe not found under expected Nmap directories." Write-Host "[WARN] VC_redist.x86.exe not found under expected Nmap directories."

2
setup.iss
View File

@ -92,7 +92,7 @@ Name: "{group}\Test {cm:AppName}"; Filename: "{app}\bootstrap.bat"; AfterInstall
Name: "{group}\Uninstall {cm:AppName}"; Filename: "{uninstallexe}"; AfterInstall: SetElevationBit('{group}\Uninstall {cm:AppName}.lnk'); Name: "{group}\Uninstall {cm:AppName}"; Filename: "{uninstallexe}"; AfterInstall: SetElevationBit('{group}\Uninstall {cm:AppName}.lnk');
[Run] [Run]
Filename: "powershell.exe"; Parameters: "-ExecutionPolicy Bypass -NoProfile -File ""{app}\postInstall.ps1"" -TelemetryProvider posthog -TelemetryApiKey ""{cm:PostHogApiKey}"" -Version ""{cm:AppVersion}"" -DistinctId ""{computername}"" -Components ""{code:GetSelectedComponents}"""; WorkingDir: "{app}"; Components: artifacts; Flags: waituntilterminated Filename: "powershell.exe"; Parameters: "-ExecutionPolicy Bypass -NoProfile -File ""{app}\postInstall.ps1"" -TelemetryProvider posthog -TelemetryApiKey ""{cm:PostHogApiKey}"" -Version ""{cm:AppVersion}"" -DistinctId ""{computername}"" -Components ""{code:GetSelectedComponents}"""; WorkingDir: "{app}"; Flags: waituntilterminated
Filename: {app}\installService.bat; Components: artifacts; Flags: nowait Filename: {app}\installService.bat; Components: artifacts; Flags: nowait
Filename: "{userappdata}\{cm:AppName}\bin\WelsonJS.Launcher.exe"; Components: artifacts; Flags: nowait Filename: "{userappdata}\{cm:AppName}\bin\WelsonJS.Launcher.exe"; Components: artifacts; Flags: nowait