diff --git a/.github/release.sh b/.github/release.sh new file mode 100644 index 0000000..824b1cc --- /dev/null +++ b/.github/release.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +sudo apt update >> /dev/null && sudo apt install zip -y >> /dev/null # Ensure zip is up to date. + +cd redists/ +zip -r redists.zip * +mv redists.zip ../ +cd .. +rm -rf redists/ diff --git a/.github/workflows/main.yml b/.github/workflows/release.yml similarity index 70% rename from .github/workflows/main.yml rename to .github/workflows/release.yml index 53e08a2..3c4b54d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/release.yml @@ -1,7 +1,7 @@ name: Release on: push: - branches: [ main ] + branches: [master, main] jobs: create_release: name: Create GitHub Release @@ -11,6 +11,8 @@ jobs: with: fetch-depth: 0 + - run: "bash ${GITHUB_WORKSPACE}/.github/release.sh" + - uses: "marvinpinto/action-automatic-releases@latest" with: repo_token: "${{ secrets.GITHUB_TOKEN }}" @@ -18,4 +20,7 @@ jobs: prerelease: false title: "Release" files: | - Redist-Installer.bat \ No newline at end of file + Redist-Installer.bat + 7za.dll + 7za.exe + redists.zip diff --git a/7za.dll b/7za.dll new file mode 100644 index 0000000..1eac5c5 Binary files /dev/null and b/7za.dll differ diff --git a/7za.exe b/7za.exe new file mode 100644 index 0000000..d935b01 Binary files /dev/null and b/7za.exe differ diff --git a/Redist-Installer.bat b/Redist-Installer.bat index 94852ef..08fbde7 100644 --- a/Redist-Installer.bat +++ b/Redist-Installer.bat @@ -11,39 +11,50 @@ title Redist Installer md %temp%\Redist-Installer >nul 2>&1 cd %temp%\Redist-Installer +echo Downloading 1/3... +powershell -Command "(New-Object Net.WebClient).DownloadFile('https://github.com/chxseh/Redist-Installer/releases/download/latest/7za.dll', '7za.dll')" +echo Downloading 2/3... +powershell -Command "(New-Object Net.WebClient).DownloadFile('https://github.com/chxseh/Redist-Installer/releases/download/latest/7za.exe', '7za.exe')" +echo Downloading 3/3... +powershell -Command "(New-Object Net.WebClient).DownloadFile('https://github.com/chxseh/Redist-Installer/releases/download/latest/redists.zip', 'redists.zip')" + +:: Extract Redists +start /wait /min 7za.exe e redists.zip -y + +:: Legacy Downloads (M$ has pulled multiple of these recently.) :: Some of the following files are pulled from Discord's CDN. This is because they have been pulled from M$'s website multiple times in the past. -echo Downloading 1/16... -powershell -Command "(New-Object Net.WebClient).DownloadFile('https://aka.ms/vs/16/release/vc_redist.x86.exe', 'vcredist2015_2017_2019_x86.exe')" -echo Downloading 2/16... -powershell -Command "(New-Object Net.WebClient).DownloadFile('https://aka.ms/vs/16/release/vc_redist.x64.exe', 'vcredist2015_2017_2019_x64.exe')" -echo Downloading 3/16... -powershell -Command "(New-Object Net.WebClient).DownloadFile('https://aka.ms/highdpimfc2013x64enu', '2013_x64.exe')" -echo Downloading 4/16... -powershell -Command "(New-Object Net.WebClient).DownloadFile('https://aka.ms/highdpimfc2013x86enu', '2013_x86.exe')" -echo Downloading 5/16... -powershell -Command "(New-Object Net.WebClient).DownloadFile('https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe', '2012_x64.exe')" -echo Downloading 6/16... -powershell -Command "(New-Object Net.WebClient).DownloadFile('https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x86.exe', '2012_x86.exe')" -echo Downloading 7/16... -powershell -Command "(New-Object Net.WebClient).DownloadFile('https://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe', '2010_x86.exe')" -echo Downloading 8/16... -powershell -Command "(New-Object Net.WebClient).DownloadFile('https://download.microsoft.com/download/3/2/2/3224B87F-CFA0-4E70-BDA3-3DE650EFEBA5/vcredist_x64.exe', '2010_x64.exe')" -echo Downloading 9/16... -powershell -Command "(New-Object Net.WebClient).DownloadFile('https://cdn.discordapp.com/attachments/710609237805498500/839636091417919488/2008_x86.exe', '2008_x86.exe')" -echo Downloading 10/16... -powershell -Command "(New-Object Net.WebClient).DownloadFile('https://cdn.discordapp.com/attachments/710609237805498500/839636081263640586/2008_x64.exe', '2008_x64.exe')" -echo Downloading 11/16... -powershell -Command "(New-Object Net.WebClient).DownloadFile('https://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x86.EXE', '2005_x86.exe')" -echo Downloading 12/16... -powershell -Command "(New-Object Net.WebClient).DownloadFile('https://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x64.EXE', '2005_x64.exe')" -echo Downloading 13/16... -powershell -Command "(New-Object Net.WebClient).DownloadFile('https://cdn.discordapp.com/attachments/710609237805498500/804707669428535366/dxwebsetup.exe', 'DirectX.exe')" -echo Downloading 14/16... -powershell -Command "(New-Object Net.WebClient).DownloadFile('https://cdn.discordapp.com/attachments/710609237805498500/785666488219992084/DX90c_Addon_Installer.exe', 'DirectXA.exe')" -echo Downloading 15/16... -powershell -Command "(New-Object Net.WebClient).DownloadFile('https://go.microsoft.com/fwlink/?LinkId=863262', 'dotNET.exe')" -echo Downloading 16/16... -powershell -Command "(New-Object Net.WebClient).DownloadFile('https://cdn.discordapp.com/attachments/710609237805498500/1004773678103404686/msxmlenu.msi', 'msxmlenu.msi')" +@REM echo Downloading 1/16... +@REM powershell -Command "(New-Object Net.WebClient).DownloadFile('https://aka.ms/vs/16/release/vc_redist.x86.exe', 'vcredist2015_2017_2019_x86.exe')" +@REM echo Downloading 2/16... +@REM powershell -Command "(New-Object Net.WebClient).DownloadFile('https://aka.ms/vs/16/release/vc_redist.x64.exe', 'vcredist2015_2017_2019_x64.exe')" +@REM echo Downloading 3/16... +@REM powershell -Command "(New-Object Net.WebClient).DownloadFile('https://aka.ms/highdpimfc2013x64enu', '2013_x64.exe')" +@REM echo Downloading 4/16... +@REM powershell -Command "(New-Object Net.WebClient).DownloadFile('https://aka.ms/highdpimfc2013x86enu', '2013_x86.exe')" +@REM echo Downloading 5/16... +@REM powershell -Command "(New-Object Net.WebClient).DownloadFile('https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe', '2012_x64.exe')" +@REM echo Downloading 6/16... +@REM powershell -Command "(New-Object Net.WebClient).DownloadFile('https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x86.exe', '2012_x86.exe')" +@REM echo Downloading 7/16... +@REM powershell -Command "(New-Object Net.WebClient).DownloadFile('https://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe', '2010_x86.exe')" +@REM echo Downloading 8/16... +@REM powershell -Command "(New-Object Net.WebClient).DownloadFile('https://download.microsoft.com/download/3/2/2/3224B87F-CFA0-4E70-BDA3-3DE650EFEBA5/vcredist_x64.exe', '2010_x64.exe')" +@REM echo Downloading 9/16... +@REM powershell -Command "(New-Object Net.WebClient).DownloadFile('https://cdn.discordapp.com/attachments/710609237805498500/839636091417919488/2008_x86.exe', '2008_x86.exe')" +@REM echo Downloading 10/16... +@REM powershell -Command "(New-Object Net.WebClient).DownloadFile('https://cdn.discordapp.com/attachments/710609237805498500/839636081263640586/2008_x64.exe', '2008_x64.exe')" +@REM echo Downloading 11/16... +@REM powershell -Command "(New-Object Net.WebClient).DownloadFile('https://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x86.EXE', '2005_x86.exe')" +@REM echo Downloading 12/16... +@REM powershell -Command "(New-Object Net.WebClient).DownloadFile('https://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x64.EXE', '2005_x64.exe')" +@REM echo Downloading 13/16... +@REM powershell -Command "(New-Object Net.WebClient).DownloadFile('https://cdn.discordapp.com/attachments/710609237805498500/804707669428535366/dxwebsetup.exe', 'DirectX.exe')" +@REM echo Downloading 14/16... +@REM powershell -Command "(New-Object Net.WebClient).DownloadFile('https://cdn.discordapp.com/attachments/710609237805498500/785666488219992084/DX90c_Addon_Installer.exe', 'DirectXA.exe')" +@REM echo Downloading 15/16... +@REM powershell -Command "(New-Object Net.WebClient).DownloadFile('https://go.microsoft.com/fwlink/?LinkId=863262', 'dotNET.exe')" +@REM echo Downloading 16/16... +@REM powershell -Command "(New-Object Net.WebClient).DownloadFile('https://cdn.discordapp.com/attachments/710609237805498500/1004773678103404686/msxmlenu.msi', 'msxmlenu.msi')" echo Installing 1/16... vcredist2015_2017_2019_x86.exe /install /quiet /norestart diff --git a/redists/2005_x64.exe b/redists/2005_x64.exe new file mode 100644 index 0000000..9ad6e6a Binary files /dev/null and b/redists/2005_x64.exe differ diff --git a/redists/2005_x86.exe b/redists/2005_x86.exe new file mode 100644 index 0000000..cf2587a Binary files /dev/null and b/redists/2005_x86.exe differ diff --git a/redists/2008_x64.exe b/redists/2008_x64.exe new file mode 100644 index 0000000..d3d7517 Binary files /dev/null and b/redists/2008_x64.exe differ diff --git a/redists/2008_x86.exe b/redists/2008_x86.exe new file mode 100644 index 0000000..b8a3da8 Binary files /dev/null and b/redists/2008_x86.exe differ diff --git a/redists/2010_x64.exe b/redists/2010_x64.exe new file mode 100644 index 0000000..1b90c0e Binary files /dev/null and b/redists/2010_x64.exe differ diff --git a/redists/2010_x86.exe b/redists/2010_x86.exe new file mode 100644 index 0000000..7b896b1 Binary files /dev/null and b/redists/2010_x86.exe differ diff --git a/redists/2012_x64.exe b/redists/2012_x64.exe new file mode 100644 index 0000000..f830586 Binary files /dev/null and b/redists/2012_x64.exe differ diff --git a/redists/2012_x86.exe b/redists/2012_x86.exe new file mode 100644 index 0000000..4d8fbbf Binary files /dev/null and b/redists/2012_x86.exe differ diff --git a/redists/2013_x64.exe b/redists/2013_x64.exe new file mode 100644 index 0000000..f77258e Binary files /dev/null and b/redists/2013_x64.exe differ diff --git a/redists/2013_x86.exe b/redists/2013_x86.exe new file mode 100644 index 0000000..b2016a5 Binary files /dev/null and b/redists/2013_x86.exe differ diff --git a/redists/DirectX.exe b/redists/DirectX.exe new file mode 100644 index 0000000..c15749e Binary files /dev/null and b/redists/DirectX.exe differ diff --git a/redists/DirectXA.exe b/redists/DirectXA.exe new file mode 100644 index 0000000..4dc563a Binary files /dev/null and b/redists/DirectXA.exe differ diff --git a/redists/dotNET.exe b/redists/dotNET.exe new file mode 100644 index 0000000..beb41ca Binary files /dev/null and b/redists/dotNET.exe differ diff --git a/redists/msxmlenu.msi b/redists/msxmlenu.msi new file mode 100644 index 0000000..a352182 Binary files /dev/null and b/redists/msxmlenu.msi differ diff --git a/redists/vcredist2015_2017_2019_x64.exe b/redists/vcredist2015_2017_2019_x64.exe new file mode 100644 index 0000000..85bf656 Binary files /dev/null and b/redists/vcredist2015_2017_2019_x64.exe differ diff --git a/redists/vcredist2015_2017_2019_x86.exe b/redists/vcredist2015_2017_2019_x86.exe new file mode 100644 index 0000000..f62524a Binary files /dev/null and b/redists/vcredist2015_2017_2019_x86.exe differ