diff --git a/Setup files/AtelierScientifiqueElevePhy_FR_8_1_7.msi b/Setup files/AtelierScientifiqueElevePhy_FR_8_1_7.msi new file mode 100644 index 0000000..aef3b10 Binary files /dev/null and b/Setup files/AtelierScientifiqueElevePhy_FR_8_1_7.msi differ diff --git a/setupApps.ps1 b/setupApps.ps1 index 9470ba8..327c205 100644 --- a/setupApps.ps1 +++ b/setupApps.ps1 @@ -122,6 +122,20 @@ function CreateURLShortcut { $urlShortcut.Save() } +function EditShortcut { + param ( + [string] $ShortcutPath, + [string] $TargetPath, + [string] $Arguments + ) + + $wshShell = New-Object -ComObject "WScript.Shell" + $shortcut = $wshShell.CreateShortcut($ShortcutPath) + $shortcut.TargetPath = $TargetPath + $shortcut.Arguments = $Arguments + $shortcut.Save() +} + function InstallApps { param ( [string] $Type @@ -152,12 +166,8 @@ function InstallApps { InstallZip -zip "EduPython.zip" -exe "EduPython.exe" -app "EduPython" -skipIf "C:\Program Files\EduPython" InstallZip -zip "rastop.zip" -exe "RasTop.exe" -app "RasTop" InstallExeSetup -app "SalsaJ_2_3.exe" -skipIf "C:\Program Files (x86)\SalsaJ" - # edit C:\Users\Public\Desktop\SalsaJ.lnk target to "C:\Program Files (x86)\Java\jre1.8\bin\javaw.exe" -jar -Dfile.encoding=UTF-8 "C:\Program Files (x86)\SalsaJ\SalsaJ.jar" - $shell = New-Object -ComObject WScript.Shell - $shortcut = $shell.CreateShortcut($(Join-Path $env:PUBLIC "Desktop\SalsaJ.lnk")) - $shortcut.TargetPath = "C:\Program Files (x86)\Java\jre-1.8\bin\javaw.exe" - $shortcut.Arguments = "-jar -Dfile.encoding=UTF-8 `"$env:ProgramFiles (x86)\SalsaJ\SalsaJ.jar`"" - $shortcut.Save() + EditShortcut -ShortcutPath $(Join-Path $env:PUBLIC "Desktop\SalsaJ.lnk") -TargetPath "C:\Program Files (x86)\Java\jre-1.8\bin\javaw.exe" -Arguments "-jar -Dfile.encoding=UTF-8 `"$env:ProgramFiles (x86)\SalsaJ\SalsaJ.jar`"" + InstallMsi -app "AtelierScientifiqueElevePhy_FR_8_1_7.msi" } "Info" { InstallMsi -app "EV3_Classroom_Windows_1.5.3_Global.msi" diff --git a/setupTmp.ps1 b/setupTmp.ps1 index 97c0f04..1502ea9 100644 --- a/setupTmp.ps1 +++ b/setupTmp.ps1 @@ -89,12 +89,16 @@ function DownloadFiles { Url = "https://git.justw.tf/Lightemerald/setup-script/raw/branch/main/Setup%20files/rastop.zip" FileName = "rastop.zip" Hash = "ae63a6aaf8c85adc16a93c7e2ebbab89b4796384" - } - , + }, @{ Url = "https://git.justw.tf/Lightemerald/setup-script/raw/branch/main/Setup%20files/SalsaJ_2_3.exe" FileName = "SalsaJ_2_3.exe" Hash = "4998000aa25dbd6dee082839854efb4ab6ac9d56" + }, + @{ + Url = "https://git.justw.tf/Lightemerald/setup-script/raw/branch/main/Setup%20files/AtelierScientifiqueElevePhy_FR_8_1_7.msi" + FileName = "AtelierScientifiqueElevePhy_FR_8_1_7.msi" + Hash = "7c5a3f080a5bc862072e8eba78299dc409b85b2c" } ) }