Merge pull request #2833 from cmderdev/update-vendor

Updates to `2` vendored dependencies

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/workflows/build.yml

@@ -8,6 +8,8 @@ name: Build Cmder
 on:
   push:
     branches: [ "master" ]
+    tags:
+      - "v*"
   pull_request:
     branches: [ "master" ]
 
@@ -72,3 +74,15 @@ jobs:
       with:
         path: build/hashes.txt
         name: hashes.txt
+
+    - name: Create Release
+      uses: softprops/action-gh-release@v1
+      with:
+        files: |
+          build/cmder.zip
+          build/cmder.7z
+          build/cmder_mini.zip
+          build/hashes.txt
+        draft: true
+        generate_release_notes: true
+      if: startsWith(github.ref, 'refs/tags/')

.github/workflows/codeql.yml

@@ -0,0 +1,68 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "master" ]
+  schedule:
+    - cron: '30 19 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: windows-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'cpp' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Use only 'java' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+    - name: Add MSBuild to PATH
+      uses: microsoft/setup-msbuild@v1
+
+    - name: Build Cmder Launcher
+      shell: pwsh
+      working-directory: scripts
+      run: .\build.ps1 -Compile -verbose
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

.github/workflows/vendor.yml

@@ -51,7 +51,7 @@ jobs:
           Set-GHVariable -Name LIST_UPDATED -Value $listUpdated.Trim(', ')
           echo "UPDATE_MESSAGE<<<EOF`n$updateMessage`n<EOF" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
 
-    - uses: peter-evans/create-pull-request@v4
+    - uses: peter-evans/create-pull-request@v5
       if: env.COUNT_UPDATED > 0
       with:
         title: 'Updates to `${{ env.COUNT_UPDATED }}` vendored dependencies'

launcher/src/CmderLauncher.cpp

@@ -425,11 +425,6 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 		swprintf_s(args, L"%s /single", args);
 	}
 
-	if (!streqi(cmderTask.c_str(), L""))
-	{
-		swprintf_s(args, L"%s /run {%s}", args, cmderTask.c_str());
-	}
-
 	if (!streqi(cmderTitle.c_str(), L""))
 	{
 		swprintf_s(args, L"%s /title \"%s\"", args, cmderTitle.c_str());
@@ -445,6 +440,14 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 		swprintf_s(args, L"%s %s", args, cmderConEmuArgs.c_str());
 	}
 
+	// The `/run` arg and its value MUST be the last arg of ConEmu
+	// see : https://conemu.github.io/en/ConEmuArgs.html
+	// > This must be the last used switch (excepting -new_console and -cur_console)
+	if (!streqi(cmderTask.c_str(), L""))
+	{
+		swprintf_s(args, L"%s /run {%s}", args, cmderTask.c_str());
+	}
+
 	SetEnvironmentVariable(L"CMDER_ROOT", exeDir);
 	if (wcscmp(userConfigDirPath, configDirPath) != 0)
 	{

scripts/update.ps1

@@ -104,7 +104,7 @@ function Fetch-DownloadUrl {
 
     $headers = @{}
 
-    if ($($env:GITHUB_TOKEN)) {
+    if ($env:GITHUB_TOKEN) {
         $headers["Authorization"] = "token $($env:GITHUB_TOKEN)"
     }
 

vendor/clink_settings.default

@@ -8,15 +8,15 @@ history.expand_mode = not_dquoted
 
 # name: Skip adding lines prefixed with whitespace
 # type: boolean
-history.ignore_space = False
+history.ignore_space = True
 
 # name: The number of history lines to save
 # type: integer
-history.max_lines = 10000
+history.max_lines = 25000
 
 # name: Share history between instances
 # type: boolean
-history.shared = True
+history.shared = False
 
 # name: Auto-answer terminate prompt
 # type: enum

vendor/init.bat

@@ -148,7 +148,7 @@ if defined CMDER_USER_CONFIG (
 )
 
 if not "%CMDER_SHELL%" == "cmd" (
-    %print_warning% "Incompatible 'ComSpec/Shell' Detetected: %CMDER_SHELL%"
+    %print_warning% "Incompatible 'ComSpec/Shell' Detected: %CMDER_SHELL%"
     set CMDER_CLINK=0
     set CMDER_ALIASES=0
 )
@@ -161,16 +161,24 @@ if "%PROCESSOR_ARCHITECTURE%"=="x86" (
     set clink_architecture=x64
     set architecture_bits=64
 ) else (
-    %print_warning% "Incompatible Processor Detetected: %PROCESSOR_ARCHITECTURE%"
+    %print_warning% "Incompatible Processor Detected: %PROCESSOR_ARCHITECTURE%"
     set CMDER_CLINK=0
 )
 
 if "%CMDER_CLINK%" == "1" (
+    REM TODO: If clink is already injected, goto :CLINK_FINISH
+    goto :INJECT_CLINK
+)
+
+goto :SKIP_CLINK
+
+:INJECT_CLINK
     %print_verbose% "Injecting Clink!"
 
     :: Check if Clink is not present
     if not exist "%CMDER_ROOT%\vendor\clink\clink_%clink_architecture%.exe" (
         %print_error% "Clink executable is not present in 'vendor\clink\clink_%clink_architecture%.exe'"
+        goto :SKIP_CLINK
     )
 
     :: Run Clink
@@ -185,7 +193,7 @@ if "%CMDER_CLINK%" == "1" (
         copy "%CMDER_ROOT%\vendor\cmder_prompt_config.lua.default" "%CMDER_CONFIG_DIR%\cmder_prompt_config.lua"
     )
 
-    :: Cleanup lagacy Clink Settings file
+    :: Cleanup legacy Clink Settings file
     if exist "%CMDER_CONFIG_DIR%\settings" if exist "%CMDER_CONFIG_DIR%\clink_settings" (
         del "%CMDER_CONFIG_DIR%\settings"
     )
@@ -198,9 +206,12 @@ if "%CMDER_CLINK%" == "1" (
     "%CMDER_ROOT%\vendor\clink\clink_%clink_architecture%.exe" inject --quiet --profile "%CMDER_CONFIG_DIR%" --scripts "%CMDER_ROOT%\vendor"
 
     if errorlevel 1 (
-        %print_error% "Clink initilization has failed with error code: %errorlevel%"
+        %print_error% "Clink initialization has failed with error code: %errorlevel%"
     )
-) else (
+
+    goto :CLINK_FINISH
+
+:SKIP_CLINK
     %print_warning% "Skipping Clink Injection!"
 
     for /f "tokens=2 delims=:." %%x in ('chcp') do set cp=%%x
@@ -210,7 +221,8 @@ if "%CMDER_CLINK%" == "1" (
     prompt $E[1;32;49m$P$S$_$E[1;30;49mλ$S$E[0m
 
     chcp %cp%>nul
-)
+
+:CLINK_FINISH
 
 if "%CMDER_CONFIGURED%" GTR "1" (
     %print_verbose% "Cmder is already configured, skipping Cmder Init!"
@@ -237,6 +249,13 @@ if defined GIT_INSTALL_ROOT (
         %print_debug% init.bat "Skipping Git Auto-Detect!"
         goto :VENDORED_GIT
     )
+
+    %print_debug% init.bat "Fast init is enabled, vendored Git does not exist"
+    for /F "delims=" %%F in ('where git.exe 2^>nul') do (
+	set "EXT_GIT_EXE=%%~fF"
+        %print_debug% init.bat "Found User installed Git at '%%~fF'. Skipping Git Auto-Detect!"
+        goto :SET_ENV
+    )
 )
 
 %print_debug% init.bat "Looking for Git install root..."
@@ -309,6 +328,8 @@ if %nix_tools% geq 1 (
     )
 )
 
+:SET_ENV
+
 :: Plink (PuTTY Link) is a command-line connection tool similar to ssh, setting its protocol to ssh
 set PLINK_PROTOCOL=ssh
 
@@ -316,6 +337,12 @@ set PLINK_PROTOCOL=ssh
 if not defined SVN_SSH set "SVN_SSH=%GIT_INSTALL_ROOT:\=\\%\\bin\\ssh.exe"
 
 :: Find locale.exe: From the git install root, from the path, using the git installed env, or fallback using the env from the path.
+setlocal enabledelayedexpansion
+if not defined git_locale if defined EXT_GIT_EXE (
+    set "GIT_INSTALL_ROOT=!EXT_GIT_EXE:\cmd\git.exe=!"
+)
+endlocal && set GIT_INSTALL_ROOT=%GIT_INSTALL_ROOT%
+
 if not defined git_locale if exist "%GIT_INSTALL_ROOT%\usr\bin\locale.exe" set git_locale="%GIT_INSTALL_ROOT%\usr\bin\locale.exe"
 if not defined git_locale for /F "tokens=* delims=" %%F in ('where locale.exe 2^>nul') do ( if not defined git_locale set git_locale="%%F" )
 if not defined git_locale if exist "%GIT_INSTALL_ROOT%\usr\bin\env.exe" set git_locale="%GIT_INSTALL_ROOT%\usr\bin\env.exe" /usr/bin/locale

vendor/lib/lib_console.cmd

@@ -40,7 +40,7 @@ exit /b
 :::.
 :::-------------------------------------------------------------------------------
 
-    if %debug_output% gtr 0 echo DEBUG(%~1): %~2 & echo.
+    if %debug_output% gtr 0 echo %time% DEBUG(%~1): %~2 & echo.
     exit /b
 
 :verbose_output

vendor/profile.ps1

@@ -5,7 +5,7 @@
 # !!! THIS FILE IS OVERWRITTEN WHEN CMDER IS UPDATED
 # !!! Use "%CMDER_ROOT%\config\user_profile.ps1" to add your own startup commands
 
-$CMDER_INIT_START = $(Get-Date -UFormat %s)
+$CMDER_INIT_START = Get-Date
 
 # Compatibility with PS major versions <= 2
 if (!$PSScriptRoot) {
@@ -123,11 +123,11 @@ if (-not (Test-Path -PathType container "$ENV:CMDER_ROOT\config\profile.d")) {
 
 Push-Location $ENV:CMDER_ROOT\config\profile.d
 foreach ($x in Get-ChildItem *.psm1) {
-    Write-Verbose Write-Host Sourcing $x
+    Write-Verbose "Sourcing $x"
     Import-Module $x
 }
 foreach ($x in Get-ChildItem *.ps1) {
-    Write-Verbose Write-Host Sourcing $x
+    Write-Verbose "Sourcing $x"
     . $x
 }
 Pop-Location
@@ -137,11 +137,11 @@ Pop-Location
 if ($ENV:CMDER_USER_CONFIG -ne "" -and (Test-Path "$ENV:CMDER_USER_CONFIG\profile.d")) {
     Push-Location $ENV:CMDER_USER_CONFIG\profile.d
     foreach ($x in Get-ChildItem *.psm1) {
-        Write-Verbose Write-Host Sourcing $x
+        Write-Verbose "Sourcing $x"
         Import-Module $x
     }
     foreach ($x in Get-ChildItem *.ps1) {
-        Write-Verbose Write-Host Sourcing $x
+        Write-Verbose "Sourcing $x"
         . $x
     }
     Pop-Location
@@ -224,5 +224,8 @@ if ( $(Get-Command prompt).Definition -match 'PS \$\(\$executionContext.SessionS
     Set-Item -Path function:\prompt  -Value $Prompt  -Options ReadOnly
 }
 
-$CMDER_INIT_END = $(Get-Date -UFormat %s)
-Write-Verbose "Elapsed Time: $(get-Date) `($($CMDER_INIT_END - $CMDER_INIT_START) total`)"
+$CMDER_INIT_END = Get-Date
+
+$ElapsedTime = New-TimeSpan -Start $CMDER_INIT_START -End $CMDER_INIT_END
+
+Write-Verbose "Elapsed Time: $($ElapsedTime.TotalSeconds) seconds total"

vendor/sources.json

@@ -1,13 +1,13 @@
 [
   {
     "name": "git-for-windows",
-    "version": "2.39.0.windows.1",
-    "url": "https://github.com/git-for-windows/git/releases/download/v2.39.0.windows.1/PortableGit-2.39.0-64-bit.7z.exe"
+    "version": "2.40.0.windows.1",
+    "url": "https://github.com/git-for-windows/git/releases/download/v2.40.0.windows.1/PortableGit-2.40.0-64-bit.7z.exe"
   },
   {
     "name": "clink",
-    "version": "1.4.4",
-    "url": "https://github.com/chrisant996/clink/releases/download/v1.4.4/clink.1.4.4.7fe1ca.zip"
+    "version": "1.4.23",
+    "url": "https://github.com/chrisant996/clink/releases/download/v1.4.23/clink.1.4.23.5fc3fc.zip"
   },
   {
     "name": "conemu-maximus5",
@@ -16,7 +16,7 @@
   },
   {
     "name": "clink-completions",
-    "version": "0.4.2",
-    "url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.4.2.zip"
+    "version": "0.4.7",
+    "url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.4.7.zip"
   }
 ]