diff --git a/Deploy/.gitignore b/Deploy/.gitignore index 6ce98c244..e88a8bc7c 100644 --- a/Deploy/.gitignore +++ b/Deploy/.gitignore @@ -19,3 +19,5 @@ user_env.cmd downloads-*.txt downloads-*.json + +.idea diff --git a/Deploy/Deploy_git.cmd b/Deploy/Deploy_git.cmd index 0b9ef1b2b..da7460440 100644 --- a/Deploy/Deploy_git.cmd +++ b/Deploy/Deploy_git.cmd @@ -9,7 +9,9 @@ if exist "%~dp0user_env.cmd" ( ) set ex7zlist=-x!*.7z -x!*.aps -x!*.bak -x!*.bdf -x!*.cache -x!*.cod -x!.codeblocks -x!*.exp -x!*.gz -x!*.hab -x!*.ilk -x!*.ipch -x!*.lib -x!*.log -x!*.msi -x!*.ncb -x!*.new -x!*.obj -x!*.opt -x!*.pdb -x!*.plg -x!*.plog -x!*.psess -x!*.pvd -x!*.sln.cache -x!*.suo -x!*.tgz -x!*.ttf -x!*.user -x!*.vsp -x!*.zip -x!*684.* -x!*sdf -x!.gitignore -x!.svn -x!curl-7.21.4 -x!Debug -x!enc_temp_folder -x!enc_temp_folder -x!gcc -x!kl_parts_gcc.* -x!makefile_lt_vc -x!MouseWheelTilt.reg -x!rebar.bmp -x!Thumbs.db -x!time2.exe -x!toolbar -x!VTune -x!WhatsNew-ConEmu-Portable.txt -x!PortableApps_Installer -x!UnitTests.cmd -x!.svnignore -x!*.o -x!!*.txt -x!*.VC.db -set ex7zpack=-x!ConEmu.Gui.map -x!ConEmu64.Gui.map -x!ConEmu\*.map -x!ConEmu\ConEmu.Addons -x!ConEmu\Portable -x!UnitTests -x!Logs -x!*.VC.db -x!far + +set ex7zpack=-x!ConEmu.Gui.map -x!ConEmu64.Gui.map -x!ConEmu\*.map -x!ConEmu\ConEmu.Addons -x!ConEmu\Portable -x!UnitTests -x!Logs -x!Descript.ion -x!*.VC.db -x!Tests_*.exe -x!far +rem ex7zpack changes should be placed in deploy.cmd and Deploy_git.cmd setlocal set ConEmuHooks=OFF @@ -71,7 +73,9 @@ rem if exist ConEmu.map ( rem if exist ConEmu1.map del ConEmu1.map rem ren ConEmu.map ConEmu1.map rem ) +echo on 7z a -r -mx=9 -ms=255f64m "%ConEmuPack_7z%" ConEmu*.exe ConEmu*.map ConEmu\* plugins\* %ex7zlist% %ex7zpack% +@echo off if errorlevel 1 goto err7z rem if exist ConEmu1.map ren ConEmu1.map ConEmu.map cd .. diff --git a/nuget/chocolatey/tools/chocolateyInstall.ps1 b/nuget/chocolatey/tools/chocolateyInstall.ps1 index 321a3d983..8420441d7 100644 --- a/nuget/chocolatey/tools/chocolateyInstall.ps1 +++ b/nuget/chocolatey/tools/chocolateyInstall.ps1 @@ -1,6 +1,6 @@ $package = 'ConEmu' $version = '23.07.24' -$sha256 = '0262DC69871B0270147173847619FC2DC9A0188754474C7BA1E0BBDDBD4E4974' +$sha256 = '2A56EDD5515DDD916410DE3D84E00069CE07566B2F81C612A4241A8B109D7F4C' $isSytem32Bit = (($Env:PROCESSOR_ARCHITECTURE -eq 'x86') -and ` ($Env:PROCESSOR_ARCHITEW6432 -eq $null))