Windows Terminal Support

.github/workflows/build.yml

@@ -45,12 +45,31 @@ 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_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@v3
@@ -82,8 +101,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

.gitignore

@@ -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
+

Cmder.bat

@@ -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
+
+

README.md

@@ -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