diff --git a/Installer/win32_cmder_user_profile.cmd b/Installer/win32_cmder_user_profile.cmd deleted file mode 100644 index 12c532d..0000000 --- a/Installer/win32_cmder_user_profile.cmd +++ /dev/null @@ -1,25 +0,0 @@ -:: use this file to run your own startup commands -:: use in front of the command to prevent printing the command - -:: uncomment this to have the ssh agent load when cmder starts -:: call "%GIT_INSTALL_ROOT%/cmd/start-ssh-agent.cmd" /k exit - -:: uncomment the next two lines to use pageant as the ssh authentication agent -:: SET SSH_AUTH_SOCK=/tmp/.ssh-pageant-auth-sock -:: call "%GIT_INSTALL_ROOT%/cmd/start-ssh-pageant.cmd" - -:: you can add your plugins to the cmder path like so -:: set "PATH=%CMDER_ROOT%\vendor\whatever;%PATH%" - -:: arguments in this batch are passed from init.bat, you can quickly parse them like so: -:: more useage can be seen by typing "cexec /?" - -:: %ccall% "/customOption" "command/program" - -@echo off -set PATH=%cmder_root%\..\Tools\zig-x86_64\zig-windows-x86_64-0.6.0;%cmder_root%\..\Tools\WPy64-3902\python-3.9.0.amd64;%PATH% -set HOME=%cmder_root%\..\Home -set HOMEPATH=%cmder_root%\..\Home -set USERPROFILE=%cmder_root%\..\Home - -alias gvim=%cmder_root%\..\Tools\GVim\gvim_noOLE.exe $* diff --git a/win32_install.bat b/win32_install.bat index 1536fd8..4eaa854 100644 --- a/win32_install.bat +++ b/win32_install.bat @@ -29,17 +29,6 @@ if not exist "%cmder_zip%" goto :eof echo - Extracting %cmder_zip% to %cmder_root% if not exist "%cmder_root%" %installer_root%\win32_7za.exe x -y -o%cmder_root% %cmder_zip% > NUL -REM -REM Cmder User Profile -REM -set cmder_user_profile=%installer_root%\win32_cmder_user_profile.cmd -set cmder_user_profile_install_dir=%cmder_root%\config -set cmder_user_profile_install_file=%cmder_user_profile_install_dir%\user_profile.cmd - -echo - Copy %cmder_user_profile% to %cmder_user_profile_install_dir% -if not exist "%cmder_user_profile_install_dir%" mkdir "%cmder_user_profile_install_dir%" -copy /Y %cmder_user_profile% %cmder_user_profile_install_file% > NUL - REM REM GVim REM @@ -149,8 +138,16 @@ set python_zip_install_path=%tools_root%\WPy64-3902 echo - Downloading from %python_url% to %python_zip_installer% if not exist "%python_zip_installer%" powershell -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; Invoke-WebRequest %python_url% -OutFile %python_zip_installer%" -if not exist "%python_zip_installer%" echo Failed to download Zig, exiting. +if not exist "%python_zip_installer%" echo Failed to download Python, exiting. if not exist "%python_zip_installer%" goto :eof echo - Unzip %python_zip_installer% to %python_zip_install_path% if not exist %python_zip_install_path% %installer_root%\win32_7za.exe x -y -o%tools_root% %python_zip_installer% > NUL + +set cmder_config_file=%cmder_root%\config\user_profile.cmd +echo @echo off> %cmder_config_file% +echo set PATH=%zig_zip_install_path%;%python_zip_install_path%\python-3.9.0.amd64;%%PATH%%>> %cmder_config_file% +echo set HOME=%cmder_root%\..\Home>> %cmder_config_file% +echo set HOMEPATH=%cmder_root%\..\Home>> %cmder_config_file% +echo set USERPROFILE=%cmder_root%\..\Home>> %cmder_config_file% +echo alias gvim=%cmder_root%\..\Tools\GVim\gvim_noOLE.exe $*>> %cmder_config_file%