Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vagrant + packer #2838

Open
wants to merge 149 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
149 commits
Select commit Hold shift + click to select a range
274cce1
optimize for speed
daxgames Feb 11, 2023
56f45a8
add debugging of path adds
daxgames Feb 12, 2023
7e50f50
add vendor/user_init.optional.cmd
daxgames Feb 12, 2023
727a99b
shared or user user_init.cmd
daxgames Feb 12, 2023
02154a8
Update to only collext cmder env vars
daxgames Feb 12, 2023
1e623ec
auto generate cmd user_init.cmd
daxgames Feb 12, 2023
3a2e747
add cleanup of unused env vars
daxgames Feb 18, 2023
9cbc184
cleanup
daxgames Feb 18, 2023
615ba5f
Delete user_init.optional.cmd
daxgames Feb 18, 2023
f1e2fb5
prevent timer results every time.
daxgames Feb 27, 2023
e0b6943
add bypass
daxgames Mar 5, 2023
c4d9365
x
daxgames Mar 11, 2023
f08ad62
Merge branch 'master' of https://github.com/cmderdev/cmder into more_…
daxgames Mar 11, 2023
42568b7
Document '--' command line argument
daxgames Mar 12, 2023
d73f959
start to add vagrant bits
daxgames Mar 15, 2023
324aaf7
more vagrant stuff
daxgames Mar 15, 2023
e33713a
more vagrant stuff
daxgames Mar 15, 2023
c565598
fixes
daxgames Mar 15, 2023
f318bcc
cleanup
daxgames Mar 15, 2023
eb2444d
more vagrant stuff
daxgames Mar 16, 2023
bc0db6a
cleanup
daxgames Mar 17, 2023
600552f
add packer stuff
daxgames Mar 17, 2023
8088864
fixes
daxgames Mar 21, 2023
0aad7da
fixes
daxgames Mar 21, 2023
e8d5528
x
daxgames Mar 21, 2023
91939db
x
daxgames Mar 24, 2023
5d270b4
install posh-git
daxgames Mar 24, 2023
95c8332
x
daxgames Mar 24, 2023
ffda6f7
fixes
daxgames Mar 24, 2023
ce69566
update packignore
daxgames Mar 24, 2023
739dcb1
lower memory requirements
daxgames Apr 8, 2023
b4ed3ba
lower memory requirements
daxgames Apr 8, 2023
2a62a04
fixes
daxgames Apr 21, 2023
eae0a22
Merge remote-tracking branch 'origin/vagrant+packer' into vagrant+packer
daxgames Apr 21, 2023
aa56c77
cleanup
daxgames Apr 21, 2023
5cb8705
add pinto10
daxgames Apr 21, 2023
65d6ecb
add README.md
daxgames Apr 22, 2023
1c399c4
cleanup
daxgames Apr 22, 2023
b46f726
Merge branch 'master' into more_speed_2
May 8, 2023
9a851da
Merge remote-tracking branch 'upstream/master' into more_speed_2
May 18, 2023
b2135cd
don't error if vim slias exists
May 30, 2023
dac3090
Merge remote-tracking branch 'origin/more_speed_2' into more_speed_2
May 30, 2023
7b55dab
Merge remote-tracking branch 'upstream/master' into more_speed_2
May 30, 2023
86b9fb2
Add ability to launch git bash from external Installed git whwen usin…
Jun 5, 2023
ea0a9bb
Merge branch 'master' into more_speed_2
Jun 5, 2023
23d3add
Merge remote-tracking branch 'upstream/master' into vagrant+packer
daxgames Jul 2, 2023
e091577
windows 11 fixes
daxgames Jul 2, 2023
4bf6598
fix multiuser user_init.cmd creation
daxgames Jul 3, 2023
294f85e
fixes
daxgames Jul 3, 2023
3ca0379
sync
daxgames Jul 3, 2023
cd92c9f
cleanup
daxgames Jul 3, 2023
5311b25
Merge remote-tracking branch 'upstream/master' into more_speed_2
daxgames Jul 4, 2023
3ced7a2
'.gitignore
daxgames Jul 4, 2023
320f928
Merge remote-tracking branch 'upstream/master' into vagrant+packer
daxgames Jul 4, 2023
4129084
add comment to clink.lua explaining /c [folderpath]
daxgames Jul 8, 2023
b47cf43
Merge pull request #14 from cmderdev/master
daxgames Jul 25, 2023
9b446b3
Merge remote-tracking branch 'upstream/master' into more_speed_2
daxgames Jul 28, 2023
1ad836b
Merge remote-tracking branch 'upstream/master' into vagrant+packer
daxgames Aug 11, 2023
52e1a02
Merge remote-tracking branch 'upstream/master' into more_speed_2
daxgames Aug 11, 2023
bd857ba
Merge remote-tracking branch 'origin/more_speed_2' into more_speed_2
daxgames Aug 11, 2023
6b330b8
allow launching windows terminal w/cmder from cmder
daxgames Aug 11, 2023
e52fa81
Merge branch 'more_speed_2' of https://github.com/daxgames/cmder into…
daxgames Aug 11, 2023
94ea2da
make it work with windows terminal
daxgames Sep 22, 2023
7c04ee9
fixes
daxgames Sep 22, 2023
968beb8
Add initial Windows Terminal support
daxgames Sep 25, 2023
d75ba7b
Merge branch 'master' of https://github.com/cmderdev/cmder into windo…
daxgames Sep 25, 2023
74c183c
Add initial Windows Terminal support
daxgames Sep 25, 2023
2728f36
fix
daxgames Sep 25, 2023
19fe75c
Merge branch 'master' into windows_terminal
daxgames Sep 25, 2023
7db6297
fix
daxgames Sep 25, 2023
759d0ed
fix
daxgames Sep 25, 2023
63bab36
fix
daxgames Sep 25, 2023
7fa041d
fix
daxgames Sep 25, 2023
7d3e691
add start_git_bash.cmd
daxgames Sep 25, 2023
8bb2c5d
Update Cmder command line help
daxgames Sep 25, 2023
e24f653
add pack code for windows terminal releases
daxgames Sep 25, 2023
396a9a0
Merge remote-tracking branch 'upstream/master' into vagrant+packer
daxgames Sep 25, 2023
cb54352
Merge branch 'master' of https://github.com/cmderdev/cmder into windo…
daxgames Sep 25, 2023
ab10e83
sync and add windows terminal to sources.
daxgames Sep 25, 2023
ad21915
Add pack code for windows terminal
daxgames Sep 25, 2023
3671a6e
pack and build all
daxgames Sep 25, 2023
3cc22ca
pack and build all
daxgames Sep 25, 2023
58db4e3
pack and build all
daxgames Sep 25, 2023
01da2fe
turn off /t in windows terminal defaults
daxgames Sep 25, 2023
ddad83c
PR Review requested changes
daxgames Sep 26, 2023
43a5e7e
PR Review requested changes
daxgames Sep 26, 2023
9c834b6
Merge branch 'master' into development
DRSDavidSoft Nov 9, 2023
678b482
Merge branch 'master' into windows_terminal
daxgames Nov 11, 2023
2ab6bcd
cleanup
daxgames Nov 11, 2023
01c41a9
Merge branch 'master' into more_speed_2
daxgames Nov 11, 2023
f69e622
Merge branch 'master' into development
daxgames Nov 11, 2023
86091b7
properly set CMDER_ROOT for windows terminal bash
daxgames Nov 12, 2023
9a40419
Merge pull request #2896 from daxgames/more_speed_2
DRSDavidSoft Nov 21, 2023
8025b5b
Merge branch 'development' into windows_terminal
DRSDavidSoft Nov 21, 2023
e01a553
Merge pull request #2897 from daxgames/windows_terminal
DRSDavidSoft Nov 21, 2023
f0c18f1
Update Cmder.bat
daxgames Nov 23, 2023
f8aa7fe
PR - Requested Changes
daxgames Nov 23, 2023
08fd69b
PR - Requested Changes
daxgames Nov 23, 2023
26e684f
PR - Requested Changes
daxgames Nov 23, 2023
30718ab
Merge remote-tracking branch 'origin/windows_terminal' into windows_t…
daxgames Nov 23, 2023
016846d
Merge remote-tracking branch 'origin/windows_terminal' into development
daxgames Nov 23, 2023
67b6278
add cmder slim
daxgames Nov 23, 2023
99b4e66
add Cmder for win
daxgames Nov 24, 2023
3c2a25a
cleanup
daxgames Nov 24, 2023
5c101a0
remove small typo
DRSDavidSoft Nov 24, 2023
e2303b1
add cmder slim (i.e. option for no bundled terminal)
DRSDavidSoft Nov 24, 2023
9ce6911
add bash and powershell to Cmder for Windows
daxgames Nov 24, 2023
467d564
cleanup
daxgames Nov 24, 2023
3ff9737
Merge remote-tracking branch 'origin/development' into development
daxgames Nov 24, 2023
a7f19f5
cleanup
daxgames Nov 24, 2023
2beb27d
cleanup
daxgames Nov 24, 2023
0f6c91d
cleanup
daxgames Nov 24, 2023
7a385eb
cleanup
daxgames Nov 24, 2023
0a691cb
Merge remote-tracking branch 'upstream/development' into development
daxgames Nov 24, 2023
d8238b0
cleanup
daxgames Nov 24, 2023
4729203
add mintty
daxgames Nov 27, 2023
38a91de
cleanup
daxgames Nov 27, 2023
28e9018
make mintty /a work
daxgames Nov 27, 2023
131949b
Merge branch 'master' into development
MartiUK Dec 20, 2023
c5579d2
Add Monokai, Default to One Half Dark
daxgames Jan 2, 2024
1ed3a36
Update windows_terminal_default_settings.json
daxgames Jan 2, 2024
5814792
Merge pull request #15 from daxgames/development-dax
daxgames Jan 2, 2024
d68c5b4
Merge pull request #2909 from cmderdev/master
DRSDavidSoft Apr 26, 2024
aac7cfc
Fix GitHub action (merge master into development)
DRSDavidSoft May 21, 2024
5d80371
Merge remote-tracking branch 'upstream/development' into development-dax
daxgames May 22, 2024
9ce8238
Update Windows Terminal to 1.20.11271.0
daxgames May 22, 2024
92c662d
Merge branch 'master' into development
DRSDavidSoft May 23, 2024
546d921
Merge branch 'master' into development
DRSDavidSoft May 28, 2024
41ac761
Update Windows Terminal
daxgames May 28, 2024
2b05b3a
Update Windows Terminal default settings
daxgames May 30, 2024
14ac14f
4096
daxgames May 30, 2024
c83c410
Merge branch 'development-dax' into vagrant+packer
daxgames May 30, 2024
f2ae245
Update Windows terminal default settings
daxgames May 30, 2024
881938e
Update Windows Terminal default settings and version
daxgames May 30, 2024
db3889d
remove vendor/start_git_mintty.cmd
daxgames May 30, 2024
e850f82
add vendor/start_git_mintty.cmd
daxgames May 30, 2024
c594642
update build workflow to upload cmder_win.zip
daxgames May 30, 2024
9463d4e
update build workflow to upload cmder_win*
daxgames May 30, 2024
9120d92
Merge pull request #2943 from daxgames/new_wt
daxgames May 30, 2024
167f57b
Merge branch 'upstream-development' into cmder4win
daxgames May 30, 2024
f38e0b3
sync
daxgames May 30, 2024
e457afa
Merge branch 'master' into development
DRSDavidSoft May 31, 2024
d36e61a
Fix build.ps1 on some systems
DRSDavidSoft May 31, 2024
aaafd37
Fix build.ps1 on some systems
daxgames May 31, 2024
2e945fb
Fix launcher overwritting/backing up emulator settings
daxgames May 31, 2024
ed92f64
Merge remote-tracking branch 'origin/fix_launcher_overwrite' into vag…
daxgames Jun 3, 2024
9c036e3
Merge remote-tracking branch 'origin/cmder4win' into vagrant+packer
daxgames Jun 3, 2024
51a0c0e
Merge remote-tracking branch 'origin/fix_build' into vagrant+packer
daxgames Jun 3, 2024
e3b2203
Merge remote-tracking branch 'origin/vagrant+packer' into vagrant+packer
daxgames Aug 21, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 45 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,52 @@ jobs:
- name: Build Cmder Launcher
shell: pwsh
working-directory: scripts
run: .\build.ps1 -Compile -verbose
run: .\build.ps1 -Compile -verbose -terminal all

- name: Pack the built files
shell: pwsh
working-directory: scripts
run: .\pack.ps1 -verbose
run: .\pack.ps1 -verbose -terminal all

- name: Upload artifact (cmder_win_mini.zip)
uses: actions/upload-artifact@v3
with:
path: build/cmder_win_mini.zip
name: cmder_win_mini.zip
if-no-files-found: error

- name: Upload artifact (cmder_win.7z)
uses: actions/upload-artifact@v3
with:
path: build/cmder_win.7z
name: cmder_win.7z
if-no-files-found: error

- name: Upload artifact (cmder_win.zip)
uses: actions/upload-artifact@v3
with:
path: build/cmder_win.zip
name: cmder_win.zip
if-no-files-found: error

- name: Upload artifact (cmder_wt.zip)
uses: actions/upload-artifact@v3
with:
path: build/cmder_wt.zip
name: cmder_wt.zip
if-no-files-found: error

- name: Upload artifact (cmder_wt.7z)
uses: actions/upload-artifact@v3
with:
path: build/cmder_wt.7z
name: cmder_wt.7z

- name: Upload artifact (cmder_wt_mini.zip)
uses: actions/upload-artifact@v3
with:
path: build/cmder_wt_mini.zip
name: cmder_wt_mini.zip

- name: Upload artifact (cmder.zip)
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -82,8 +122,11 @@ jobs:
with:
files: |
build/cmder.zip
build/cmder_wt.zip
build/cmder.7z
build/cmder_wt.7z
build/cmder_mini.zip
build/cmder_wt_mini.zip
build/hashes.txt
draft: true
generate_release_notes: true
Expand Down
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,10 @@ launcher/src/version.rc2
.vs/*
.vscode
.idea
.vagrant/
scripts/packer/iso/*.iso
!scripts/packer/floppy/*.exe
scripts/packer/packer_cache
scripts/packer/output-*
*.box

74 changes: 60 additions & 14 deletions Cmder.bat
Original file line number Diff line number Diff line change
@@ -1,20 +1,66 @@
@echo off

SET CMDER_ROOT=%~dp0

:: Remove Trailing '\'
@if "%CMDER_ROOT:~-1%" == "\" SET CMDER_ROOT=%CMDER_ROOT:~0,-1%

if not exist "%CMDER_ROOT%\config\user_ConEmu.xml" (
if not exist "%CMDER_ROOT%\config" mkdir "%CMDER_ROOT%\config" 2>nul
copy "%CMDER_ROOT%\vendor\ConEmu.xml.default" "%CMDER_ROOT%\config\user_ConEmu.xml" 1>nul
if %errorlevel% neq 0 (
echo ERROR: CMDER Initialization has Failed
exit /b 1
)
set CMDER_TERMINAL=conemu
if exist "%CMDER_ROOT%\vendor\windows-terminal\windowsterminal.exe" (
SET CMDER_TERMINAL=windows-terminal
)

if exist "%~1" (
start %~dp0/vendor/conemu-maximus5/ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%~1"
) else (
start %~dp0/vendor/conemu-maximus5/ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%CMDER_ROOT%\config\user_ConEmu.xml"
if NOT "%~1" == "" (
SET CMDER_TERMINAL=%~1
shift
)

:: Remove Trailing '\'
if "%CMDER_ROOT:~-1%" == "\" SET CMDER_ROOT=%CMDER_ROOT:~0,-1%

if not exist "%CMDER_ROOT%\config" md "%CMDER_ROOT%\config" 2>nul

call :%CMDER_TERMINAL%
exit /b

:conemu
if not exist "%CMDER_ROOT%\config\user_ConEmu.xml" (
copy "%CMDER_ROOT%\vendor\ConEmu.xml.default" "%CMDER_ROOT%\config\user_ConEmu.xml" 1>nul
if %errorlevel% neq 0 (
echo ERROR: CMDER Initialization has Failed
exit /b 1
)
)

if exist "%~1" (
start %cmder_root%\vendor\conemu-maximus5\ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%~1"
) else (
start %cmder_root%\vendor\conemu-maximus5\ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%CMDER_ROOT%\config\user_ConEmu.xml"
)
exit /b

:windows-terminal
if not exist "%CMDER_ROOT%\vendor\windows-terminal\settings" md "%CMDER_ROOT%\vendor\windows-terminal\settings" 2>nul
if not exist "%CMDER_ROOT%\vendor\windows-terminal\.portable" echo "This makes this installation of Windows Terminal portable" >"%CMDER_ROOT%\vendor\windows-terminal\.portable" 2>nul

if exist "%CMDER_ROOT%\config\user_windows_terminal_settings.json" (
if not exist "%CMDER_ROOT%\vendor\windows-terminal\settings\settings.json" (
echo "Copying user Windows Terminal settings to '%CMDER_ROOT%\vendor\windows-terminal\settings\settings.json'..."
copy "%CMDER_ROOT%\config\user_windows_terminal_settings.json" "%CMDER_ROOT%\vendor\windows-terminal\settings\settings.json" 1>nul
)
) else if not exist "%CMDER_ROOT%\config\user_windows_terminal_settings.json" (
if not exist "%CMDER_ROOT%\config" mkdir "%CMDER_ROOT%\config" 2>nul
echo "Copying default Windows Terminal settings to '%CMDER_ROOT%\config'..."
copy "%CMDER_ROOT%\vendor\windows_terminal_default_settings.json" "%CMDER_ROOT%\config\user_windows_terminal_settings.json" 1>nul
echo "Copying default Windows Terminal settings to '%CMDER_ROOT%\vendor\windows-terminal\settings\settings.json'..."
copy "%CMDER_ROOT%\vendor\windows_terminal_default_settings.json" "%CMDER_ROOT%\vendor\windows-terminal\settings\settings.json" 1>nul

if %errorlevel% neq 0 (
echo ERROR: CMDER Initialization has Failed
exit /b 1
)
) else if exist "%cmder_root%\vendor\windows-terminal\settings\settings.json" (
copy "%cmder_root%\vendor\windows-terminal\settings\settings.json" "%CMDER_ROOT%\config\user_windows_terminal_settings.json"
)

start %cmder_root%\vendor\windows-terminal\windowsterminal.exe
exit /b


2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ The Cmder's user interface is also designed to be more eye pleasing, and you can
| `/SINGLE` | Start Cmder in single mode. |
| `/START [start_path]` | Folder path to start in. |
| `/TASK [task_name]` | Task to start after launch. |
| `/X [ConEmu extras pars]` | Forwards parameters to ConEmu |
| `-- [ConEmu extras pars]` | Forwards ALL remaining parameters to ConEmu. |

## Context Menu Integration

Expand Down
66 changes: 66 additions & 0 deletions Vagrantfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
required_plugins = %w( vagrant-vbguest )
required_plugins.each do |plugin|
unless Vagrant.has_plugin? plugin
system "vagrant plugin install #{plugin}"
p "Run 'vagrant up' again to continue."
exit 0
end
end

Vagrant.configure("2") do |config|
# config.vbguest.iso_path = "../../../../usr/share/virtualbox/VBoxGuestAdditions.iso"
config.vbguest.allow_downgrade = true

config.vm.define "cmderdev-10" do |b|
b.vm.hostname = "cmderdev-10"
b.vm.box = "dgames/cmderdev-10"
b.vm.box_version = "1.0.0"

b.vm.provider :virtualbox do |v|
# v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
v.customize ["modifyvm", :id, "--name", "cmderdev-10"]
v.customize ["modifyvm", :id, "--ostype", "Windows10_64"]
v.customize ["modifyvm", :id, "--graphicscontroller", "vboxsvga"]
v.customize ["modifyvm", :id, "--memory", 2048]
v.customize ["modifyvm", :id, "--clipboard", "bidirectional"]
end
end

config.vm.define "cmderdev-10s" do |b|
b.vm.hostname = 'cmderdev-10'
b.vm.box = "dgames/cmderdev-10"
b.vm.box_version = "1.0.0"

b.vm.provider :virtualbox do |v|
# v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
v.customize ["modifyvm", :id, "--name", "cmderdev-10s"]
v.customize ["modifyvm", :id, "--ostype", "Windows10_64"]
v.customize ["modifyvm", :id, "--graphicscontroller", "vboxsvga"]
v.customize ["modifyvm", :id, "--memory", 2048]
v.customize ["modifyvm", :id, "--clipboard", "bidirectional"]
v.customize ["setextradata", :id, "GUI/ScaleFactor", "1.75"]
end
end

config.vm.define "cmderdev-11" do |b|
b.vm.box = "dgames/cmderdev-11"
b.vm.box_version = "1.0.0"

b.vm.provider :virtualbox do |v|
# v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
v.customize ["modifyvm", :id, "--name", "cmderdev-11"]
v.customize ["modifyvm", :id, "--ostype", "Windows11_64"]
v.customize ["modifyvm", :id, "--graphicscontroller", "vboxvga"]
v.customize ["modifyvm", :id, "--memory", 4096]
v.customize ["modifyvm", :id, "--clipboard", "bidirectional"]
end
end

config.vm.provision "file", source: "./scripts/vagrant/windows_terminal_settings.json.default", destination: "windows_terminal_settings.json.default"
config.vm.provision "file", source: "./scripts/vagrant/windows_terminal_state.json.default", destination: "windows_terminal_state.json.default"
config.vm.provision "file", source: "./vendor/bin/set-shortcut.ps1", destination: "c:\\windows\\set-shortcut.ps1"
config.vm.provision "shell", path: './scripts/vagrant/add-cmder.ps1'
config.vm.provision "shell", path: './vendor/bin/add-vscodeprofile.ps1'
config.vm.provision "shell", path: './vendor/bin/add-windowsterminalprofiles.ps1'
config.vm.provision "shell", path: './vendor/bin/add-cmdertodesktop.ps1'
end
Loading