From f0c18f1fc63647b0746dad2ee4cfd4f365e8f2cd Mon Sep 17 00:00:00 2001 From: Dax T Games Date: Thu, 23 Nov 2023 06:50:12 -0500 Subject: [PATCH 1/3] Update Cmder.bat --- Cmder.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cmder.bat b/Cmder.bat index e50a44f..423b2c8 100644 --- a/Cmder.bat +++ b/Cmder.bat @@ -2,7 +2,7 @@ SET CMDER_ROOT=%~dp0 -set CMDER_TERMINAl=conemu +set CMDER_TERMINAL=conemu if exist "%CMDER_ROOT%\vendor\windows-terminal\windowsterminal.exe" ( SET CMDER_TERMINAL=windows-terminal ) From 08fd69bdef876f04494fe79adde34cd491e88e71 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Thu, 23 Nov 2023 07:16:42 -0500 Subject: [PATCH 2/3] PR - Requested Changes --- .github/workflows/build.yml | 4 ++-- scripts/build.ps1 | 12 ++++++------ scripts/pack.ps1 | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1dc62b4..6e803e6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,12 +45,12 @@ 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 -emulator all + run: .\pack.ps1 -verbose -terminal all - name: Upload artifact (cmder_wt.zip) uses: actions/upload-artifact@v3 diff --git a/scripts/build.ps1 b/scripts/build.ps1 index e82193e..b308124 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -57,14 +57,14 @@ Param( [switch]$noVendor, # Using this option will specify the emulator to use [all, conemu-maximus5, or windows-terminal] - [string]$emulator = 'all', + [string]$terminal = 'all', # Build launcher if you have MSBuild tools installed [switch]$Compile ) # Get the scripts and cmder root dirs we are building in. -$cmder_root = [string](Resolve-Path "$PSScriptRoot\..") +$cmder_root = Resolve-Path "$PSScriptRoot\.." # Dot source util functions into this scope . "$PSScriptRoot\utils.ps1" @@ -137,9 +137,9 @@ if (-not $noVendor) { } foreach ($s in $sources) { - if ($s.name -eq "conemu-maximus5" -and $emulator -eq "windows-terminal") { + if ($s.name -eq "conemu-maximus5" -and $terminal -eq "windows-terminal") { return - } elseif ($s.name -eq "windows-terminal" -and $emulator -eq "conemu-maximus5") { + } elseif ($s.name -eq "windows-terminal" -and $terminal -eq "conemu-maximus5") { return } @@ -156,8 +156,8 @@ if (-not $noVendor) { # Make Embedded Windows Terminal Portable if ($s.name -eq "windows-terminal") { $windowTerminalFiles = resolve-path ($saveTo + "\" + $s.name + "\terminal*") - move-item -ErrorAction SilentlyContinue $windowTerminalFiles\* $s.name >$null - remove-item -ErrorAction SilentlyContinue $windowTerminalFiles >$null + move-item -ErrorAction SilentlyContinue $windowTerminalFiles\* $s.name >$null + remove-item -ErrorAction SilentlyContinue $windowTerminalFiles >$null write-verbose "Making Windows Terminal Portable..." New-Item -Type Directory -Path (Join-Path $saveTo "/windows-terminal/settings") -ErrorAction SilentlyContinue >$null New-Item -Type File -Path (Join-Path $saveTo "/windows-terminal/.portable") -ErrorAction SilentlyContinue >$null diff --git a/scripts/pack.ps1 b/scripts/pack.ps1 index 45e0a63..27e3fb6 100644 --- a/scripts/pack.ps1 +++ b/scripts/pack.ps1 @@ -32,7 +32,7 @@ Param( [string]$cmderRoot = "$PSScriptRoot\..", # Using this option will pack artifacts for a specific included terminal emulator [all, conemu-maximus5, or windows-terminal] - [string]$emulator = 'all', + [string]$terminal = 'all', # Vendor folder locaton [string]$saveTo = "$PSScriptRoot\..\build" @@ -44,13 +44,13 @@ $cmderRoot = Resolve-Path $cmderRoot $ErrorActionPreference = "Stop" Ensure-Executable "7z" -if ($emulator -eq "windows-terminal") { +if ($terminal -eq "windows-terminal") { $targets = @{ "cmder_wt.7z" = "-t7z -m0=lzma2 -mx=9 -mfb=64 -md=32m -ms=on -myx=7 -mqs=on -xr!`"vendor\conemu-maximus5`""; "cmder_wt.zip" = "-mm=Deflate -mfb=128 -mpass=3 -xr!`"vendor\conemu-maximus5`""; "cmder_wt_mini.zip" = "-xr!`"vendor\git-for-windows`" -xr!`"vendor\conemu-maximus5`""; } -} elseif ($emulator -eq "windows-terminal") { +} elseif ($terminal -eq "windows-terminal") { $targets = @{ "cmder.7z" = "-t7z -m0=lzma2 -mx=9 -mfb=64 -md=32m -ms=on -myx=7 -mqs=on -xr!`"vendor\windows-terminal`""; "cmder.zip" = "-mm=Deflate -mfb=128 -mpass=3 -xr!`"vendor\windows-terminal`""; From 26e684fb38e905f4ecd9b868d15914269b72d82c Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Thu, 23 Nov 2023 07:20:26 -0500 Subject: [PATCH 3/3] PR - Requested Changes --- Cmder.bat | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cmder.bat b/Cmder.bat index e50a44f..423b2c8 100644 --- a/Cmder.bat +++ b/Cmder.bat @@ -2,7 +2,7 @@ SET CMDER_ROOT=%~dp0 -set CMDER_TERMINAl=conemu +set CMDER_TERMINAL=conemu if exist "%CMDER_ROOT%\vendor\windows-terminal\windowsterminal.exe" ( SET CMDER_TERMINAL=windows-terminal ) diff --git a/README.md b/README.md index 735fd1e..cda18e9 100644 --- a/README.md +++ 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