diff --git a/scripts/install-python.cmd b/optional/install-python2.cmd similarity index 100% rename from scripts/install-python.cmd rename to optional/install-python2.cmd diff --git a/scripts/autoconfig-all.cmd b/scripts/autoconfig-all.cmd index bd1d53d..92b1bba 100644 --- a/scripts/autoconfig-all.cmd +++ b/scripts/autoconfig-all.cmd @@ -111,7 +111,7 @@ echo. call install-go.cmd echo. -call install-python.cmd +call install-python3.cmd echo. rem fuck you microsoft ... diff --git a/scripts/install-python3.cmd b/scripts/install-python3.cmd new file mode 100644 index 0000000..1ef8234 --- /dev/null +++ b/scripts/install-python3.cmd @@ -0,0 +1,20 @@ +@echo off + +set SCRIPTS=..\scripts +set SOFTWARE=..\software +set EXE=python3-setup.exe + +if NOT EXIST %SOFTWARE%\%EXE% ( + echo ERROR: %SOFTWARE%\%EXE% not found! + exit /b +) + +echo ####### %0 ####### + +cd %SOFTWARE% +@echo on +%EXE% InstallAllUsers=1 PrependPath=0 /passive +@echo off +cd %SCRIPTS% + +echo ####### %0 ####### diff --git a/scripts/modify-path.cmd b/scripts/modify-path.cmd index 5b6cf06..2a8f1a0 100644 --- a/scripts/modify-path.cmd +++ b/scripts/modify-path.cmd @@ -10,6 +10,7 @@ set newPATH=%SYSTEMROOT%;%SYSTEMROOT%\system32;^ %ProgramFiles%\PureBasic\Compilers;^ %ProgramFiles%\Go\bin;^ %SystemDrive%\Python27;^ +%ProgramFiles%\Python39;^ %ProgramFiles%\FarManager echo ####### %0 ####### diff --git a/software/basic.csv b/software/basic.csv index 117a383..094804f 100644 --- a/software/basic.csv +++ b/software/basic.csv @@ -17,7 +17,7 @@ https://winscp.net/download/WinSCP-5.17.10-Portable.zip winscp.zip https://www.sordum.org/files/downloads.php?st-windows-update-blocker wub.zip https://farmanager.com/files/Far30b5700.x64.20201112.msi far-setup.msi https://golang.org/dl/go1.16.windows-amd64.msi go-setup.msi -https://www.python.org/ftp/python/3.9.2/python-3.9.2-embed-amd64.zip python-setup.msi +https://www.python.org/ftp/python/3.9.2/python-3.9.2-amd64.exe python3-setup.exe http://www.drivesnapshot.de/download/snapshot64.exe snapshot64.exe https://ftp.halifax.rwth-aachen.de/videolan/vlc/3.0.12/win64/vlc-3.0.12-win64.exe vlc-setup.exe https://github.com/microsoft/terminal/releases/download/v1.5.10411.0/Microsoft.WindowsTerminal_1.5.10411.0_8wekyb3d8bbwe.msixbundle windowsterminal-setup.msixbundle diff --git a/software/optional.csv b/software/optional.csv index 4ffc531..171ae15 100644 --- a/software/optional.csv +++ b/software/optional.csv @@ -10,3 +10,4 @@ https://totalcommander.ch/win/fixed/tcmd951x64.exe totalcommander-setup.exe https://download.virtualbox.org/virtualbox/6.1.18/VirtualBox-6.1.18-142142-Win.exe virtualbox-setup.exe https://code.visualstudio.com/sha/download?build=stable&os=win32-x64 vscode-setup.exe https://download.xnview.com/XnViewMP-win-x64.exe xnview-setup.exe +https://www.python.org/ftp/python/2.7.18/python-2.7.18.amd64.msi python2-setup.msi