diff --git a/setupApps.ps1 b/setupApps.ps1 index 1f392e3..352f89b 100644 --- a/setupApps.ps1 +++ b/setupApps.ps1 @@ -32,12 +32,16 @@ function InstallExe { function InstallZipSetup { param ( [string] $zip, - [string] $exe + [string] $exe, + [bool] $createSubfolder = $false ) $zipName = [System.IO.Path]::GetFileNameWithoutExtension($zip) Write-Host "Installing $zipName..." - $expPath = Join-Path $tmpPath $zipName - Write-Host "ExePath: $expPath" + $expPath = Join-Path $tmpPath + if ($createSubfolder) { + $expPath = Join-Path $expPath $zipName + } + Write-Host "ExpandPath: $expPath" Write-Host "ZipPath: $(Join-Path $tmpPath $zip)" Write-Host "SetupPath: $(Join-Path -Path $expPath -ChildPath (Join-Path -Path $zipName -ChildPath $exe))" Expand-Archive -Path (Join-Path $tmpPath $zip) -DestinationPath $expPath -Force @@ -115,8 +119,8 @@ function InstallApps { InstallZip -zip "paleoterre_el32.zip" -exe "paleoTerre.exe" -app "PaleoTerre" InstallExeSetup -app "Eduanat2_Setup_2.0.0.exe" InstallZip -zip "couvac_exe.zip" -exe "couvac.exe" -app "Couvac" -createSubfolder $true - InstallZipSetup -zip "ACDLabs202311_ChemSketch_FInstall.zip" -exe "setup.exe" - InstallZipSetup -zip "Anagene.zip" -exe "Anagene/Setup.exe" + InstallZipSetup -zip "ACDLabs202311_ChemSketch_FInstall.zip" -exe "setup.exe" -createSubfolder $true + InstallZipSetup -zip "Anagene.zip" -exe "Setup.exe" } "Info" { InstallZip -zip "simulation.zip" -exe "simulation.exe" -app "Simulation Domotique"