Initial plan

Refactor path enhancement logic for clarity and robustness.

.github/workflows/build.yml

@@ -53,26 +53,26 @@ jobs:
       run: .\pack.ps1 -verbose
 
     - name: Upload artifact (cmder.zip)
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         path: build/cmder.zip
         name: cmder.zip
         if-no-files-found: error
 
     - name: Upload artifact (cmder.7z)
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         path: build/cmder.7z
         name: cmder.7z
 
     - name: Upload artifact (cmder_mini.zip)
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         path: build/cmder_mini.zip
         name: cmder_mini.zip
 
     - name: Upload artifact (hashes.txt)
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         path: build/hashes.txt
         name: hashes.txt

.github/workflows/codeql.yml

@@ -49,7 +49,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -68,6 +68,6 @@ jobs:
       run: .\build.ps1 -Compile -verbose
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4
       with:
         category: "/language:${{matrix.language}}"

scripts/build.ps1

@@ -21,7 +21,7 @@
 
     Skip all downloads and only build launcher.
 .EXAMPLE
-    .\build.ps1 -verbose
+    .\build -verbose
 
     Execute the build and see what's going on.
 .EXAMPLE
@@ -33,7 +33,7 @@
     Samuel Vasko, Jack Bennett
     Part of the Cmder project.
 .LINK
-    https://github.com/cmderdev/cmder - Project Home
+    http://cmder.app/ - Project Home
 #>
 [CmdletBinding(SupportsShouldProcess = $true)]
 Param(

scripts/pack.ps1

@@ -35,7 +35,7 @@ Param(
     [string]$saveTo = "$PSScriptRoot\..\build"
 )
 
-$cmder_root = Resolve-Path $cmderRoot
+$cmderRoot = Resolve-Path $cmderRoot
 
 . "$PSScriptRoot\utils.ps1"
 $ErrorActionPreference = "Stop"
@@ -47,10 +47,10 @@ $targets = @{
     "cmder_mini.zip" = "-xr!`"vendor\git-for-windows`"";
 }
 
-Push-Location -Path $cmder_root
+Push-Location -Path $cmderRoot
 
-Delete-Existing "$cmder_root\Version*"
-Delete-Existing "$cmder_root\build\*"
+Delete-Existing "$cmderRoot\Version*"
+Delete-Existing "$cmderRoot\build\*"
 
 if (-not (Test-Path -PathType container $saveTo)) {
     (New-Item -ItemType Directory -Path $saveTo) | Out-Null
@@ -59,16 +59,16 @@ if (-not (Test-Path -PathType container $saveTo)) {
 $saveTo = Resolve-Path $saveTo
 
 $version = Get-VersionStr
-(New-Item -ItemType file "$cmder_root\Version $version") | Out-Null
+(New-Item -ItemType file "$cmderRoot\Version $version") | Out-Null
 
 if ($PSCmdlet.MyInvocation.BoundParameters["Verbose"].IsPresent) {
     Write-Verbose "Packing Cmder $version in $saveTo..."
-    $excluded = (Get-Content -Path "$cmder_root\packignore") -Split [System.Environment]::NewLine | Where-Object { $_ }
-    Get-ChildItem $cmder_root -Force -Exclude $excluded
+    $excluded = (Get-Content -Path "$cmderRoot\packignore") -Split [System.Environment]::NewLine | Where-Object { $_ }
+    Get-ChildItem $cmderRoot -Force -Exclude $excluded
 }
 
 foreach ($t in $targets.GetEnumerator()) {
-    Create-Archive "$cmder_root" "$saveTo\$($t.Name)" $t.Value
+    Create-Archive "$cmderRoot" "$saveTo\$($t.Name)" $t.Value
     $hash = (Digest-Hash "$saveTo\$($t.Name)")
     Add-Content -path "$saveTo\hashes.txt" -value ($t.Name + ' ' + $hash)
 }

scripts/update.ps1

@@ -5,17 +5,17 @@
     This script updates dependencies to the latest version in vendor/sources.json file.
 
     You will need to make this script executable by setting your Powershell Execution Policy to Remote signed
-    Then unblock the script for execution with UnblockFile .\update.ps1
+    Then unblock the script for execution with UnblockFile .\build.ps1
 .EXAMPLE
-    .\update.ps1
+    .\build.ps1
 
     Updates the dependency sources in the default location, the vendor/sources.json file.
 .EXAMPLE
-    .\update.ps1 -verbose
+    .\build -verbose
 
     Updates the dependency sources and see what's going on.
 .EXAMPLE
-    .\update.ps1 -SourcesPath '~/custom/vendors.json'
+    .\build.ps1 -SourcesPath '~/custom/vendors.json'
 
     Specify the path to update dependency sources file at.
 .NOTES
@@ -23,7 +23,7 @@
     David Refoua <David@Refoua.me>
     Part of the Cmder project.
 .LINK
-    https://github.com/cmderdev/cmder - Project Home
+    http://cmder.app/ - Project Home
 #>
 [CmdletBinding(SupportsShouldProcess = $true)]
 Param(

scripts/utils.ps1

@@ -1,6 +1,7 @@
 function Ensure-Exists($path) {
     if (-not (Test-Path $path)) {
-        throw "Missing required $path! Ensure it is installed"
+        Write-Error "Missing required $path! Ensure it is installed"
+        exit 1
     }
     return $true > $null
 }
@@ -15,7 +16,8 @@ function Ensure-Executable($command) {
             Set-Alias -Name "7z" -Value "$env:programw6432\7-zip\7z.exe" -Scope script
         }
         else {
-            throw "Missing $command! Ensure it is installed and on in the PATH"
+            Write-Error "Missing $command! Ensure it is installed and on in the PATH"
+            exit 1
         }
     }
 }

vendor/lib/lib_base.cmd

@@ -4,7 +4,7 @@ set lib_base=call "%~dp0lib_base.cmd"
 
 if "%~1" == "/h" (
     %lib_base% help "%~0"
-) else if "%1" neq "" (
+) else if "%~1" neq "" (
     call :%*
 )
 

vendor/lib/lib_console.cmd

@@ -14,7 +14,7 @@ if %fast_init% gtr %verbose_output% if %fast_init% gtr %debug_output% exit /b
 
 if "%~1" == "/h" (
     %lib_base% help "%~0"
-) else if "%1" neq "" (
+) else if "%~1" neq "" (
     call :%*
 )
 

vendor/lib/lib_git.cmd

@@ -1,12 +1,12 @@
 @echo off
 
 call "%~dp0lib_base.cmd"
-call "%%~dp0lib_console.cmd"
+call "%~dp0lib_console.cmd"
 set lib_git=call "%~dp0lib_git.cmd"
 
 if "%~1" == "/h" (
     %lib_base% help "%~0"
-) else if "%1" neq "" (
+) else if "%~1" neq "" (
     call :%*
 )
 

vendor/lib/lib_path.cmd

@@ -1,12 +1,12 @@
 @echo off
 
 call "%~dp0lib_base.cmd"
-call "%%~dp0lib_console"
+call "%~dp0lib_console.cmd"
 set lib_path=call "%~dp0lib_path.cmd"
 
 if "%~1" == "/h" (
     %lib_base% help "%~0"
-) else if "%1" neq "" (
+) else if "%~1" neq "" (
     call :%*
 )
 
@@ -48,7 +48,7 @@ exit /b
         set "add_path=%~1"
     ) else (
         %print_error% "You must specify a directory to add to the path!"
-        exit 1
+        exit /b 1
     )
 
     if "%~2" neq "" if /i "%~2" == "append" (
@@ -72,7 +72,7 @@ exit /b
             set "PATH=%add_to_path%;%PATH%"
         )
         goto :end_enhance_path
-    ) else if "add_to_path" equ "" (
+    ) else if "%add_to_path%" equ "" (
         goto :end_enhance_path
     )
 
@@ -84,20 +84,20 @@ exit /b
 
     setlocal enabledelayedexpansion
     if "!found!" == "0" (
-        echo "!path!"|!WINDIR!\System32\findstr >nul /I /R /C:";!find_query!;"
+        echo "!PATH!"|!WINDIR!\System32\findstr >nul /I /R /C:";!find_query!;"
         call :set_found
     )
     %print_debug% :enhance_path "Env Var INSIDE PATH !find_query! - found=!found!"
 
     if /i "!position!" == "append" (
         if "!found!" == "0" (
-            echo "!path!"|!WINDIR!\System32\findstr >nul /I /R /C:";!find_query!\"$"
+            echo "!PATH!"|!WINDIR!\System32\findstr >nul /I /R /C:";!find_query!$"
             call :set_found
         )
         %print_debug% :enhance_path "Env Var END PATH !find_query! - found=!found!"
     ) else (
         if "!found!" == "0" (
-            echo "!path!"|!WINDIR!\System32\findstr >nul /I /R /C:"^\"!find_query!;"
+            echo "!PATH!"|!WINDIR!\System32\findstr >nul /I /R /C:"^!find_query!;"
             call :set_found
         )
         %print_debug% :enhance_path "Env Var BEGIN PATH !find_query! - found=!found!"
@@ -119,7 +119,8 @@ exit /b
     :end_enhance_path
     set "PATH=%PATH:;;=;%"
 
-    REM echo %path%|"C:\Users\dgames\cmder - dev\vendor\git-for-windows\usr\bin\wc" -c
+    REM echo %path%|wc -c
+
     if "%fast_init%" == "1" exit /b
 
     if not "%OLD_PATH:~0,3000%" == "%OLD_PATH:~0,3001%" goto :toolong
@@ -127,15 +128,22 @@ exit /b
     exit /b
 
     :toolong
-        echo "%OLD_PATH%">"%temp%\cmder_lib_pathA"
-        echo "%PATH%">"%temp%\cmder_lib_pathB"
-        fc /b "%temp%\cmder_lib_pathA" "%temp%\cmder_lib_pathB" 2>nul 1>nul
-        if errorlevel 1 ( del "%temp%\cmder_lib_pathA" & del "%temp%\cmder_lib_pathB" & goto :changed )
-        del "%temp%\cmder_lib_pathA" & del "%temp%\cmder_lib_pathB"
+        set "_rand=%RANDOM%"
+        if exist "%temp%\%_rand%_cmder_lib_pathA" del "%temp%\%_rand%_cmder_lib_pathA" 2>nul 1>nul
+        if exist "%temp%\%_rand%_cmder_lib_pathB" del "%temp%\%_rand%_cmder_lib_pathB" 2>nul 1>nul
+        if exist "%temp%\%_rand%_cmder_lib_pathA" goto :toolong
+        if exist "%temp%\%_rand%_cmder_lib_pathB" goto :toolong
+        echo "%OLD_PATH%">"%temp%\%_rand%_cmder_lib_pathA"
+        if errorlevel 1 ( if exist "%temp%\%_rand%_cmder_lib_pathA" del "%temp%\%_rand%_cmder_lib_pathA" & goto :toolong )
+        echo "%PATH%">"%temp%\%_rand%_cmder_lib_pathB"
+        if errorlevel 1 ( if exist "%temp%\%_rand%_cmder_lib_pathA" del "%temp%\%_rand%_cmder_lib_pathA" & if exist "%temp%\%_rand%_cmder_lib_pathB" del "%temp%\%_rand%_cmder_lib_pathB" & goto :toolong )
+        fc /b "%temp%\%_rand%_cmder_lib_pathA" "%temp%\%_rand%_cmder_lib_pathB" 2>nul 1>nul
+        if errorlevel 1 ( del "%temp%\%_rand%_cmder_lib_pathA" & del "%temp%\%_rand%_cmder_lib_pathB" & set "_rand=" & goto :changed )
+        del "%temp%\%_rand%_cmder_lib_pathA" & del "%temp%\%_rand%_cmder_lib_pathB" & set "_rand="
         exit /b
 
     :changed
-        %print_debug% :enhance_path "END Env Var - PATH=%path%"
+        %print_debug% :enhance_path "END Env Var - PATH=%PATH%"
         %print_debug% :enhance_path "Env Var %find_query% - found=%found%"
         exit /b
 
@@ -179,16 +187,31 @@ exit /b
         set "add_path=%~1"
     ) else (
         %print_error% "You must specify a directory to add to the path!"
-        exit 1
+        exit /b 1
     )
 
+    rem Parse arguments robustly:
+    rem Accept either public form: "[dir_path]" [max_depth] [append]
+    rem or internal recursive form: "[dir_path]" [depth] [max_depth] [append]
     set "depth=%~2"
     set "max_depth=%~3"
-
-    if "%~4" neq "" if /i "%~4" == "append" (
-        set "position=%~4"
-    ) else (
     set "position="
+
+    if /i "%~4" == "append" set "position=append"
+    if /i "%~3" == "append" (
+        set "position=append"
+        set "max_depth="
+    )
+
+    if not defined depth set "depth=0"
+    if not defined max_depth (
+        if defined depth (
+            rem If only one numeric argument provided, treat it as max_depth
+            set "max_depth=%depth%"
+            set "depth=0"
+        ) else (
+            set "max_depth=1"
+        )
     )
 
     dir "%add_path%" 2>NUL | findstr -i -e "%find_pathext%" >NUL
@@ -224,8 +247,6 @@ exit /b
         call :loop_depth
     )
 
-    set "PATH=%PATH%"
-
     exit /b
 
 :set_depth

vendor/lib/lib_profile.cmd

@@ -1,12 +1,12 @@
 @echo off
 
 call "%~dp0lib_base.cmd"
-call "%%~dp0lib_console"
+call "%~dp0lib_console.cmd"
 set lib_profile=call "%~dp0lib_profile.cmd"
 
 if "%~1" == "/h" (
     %lib_base% help "%~0"
-) else if "%1" neq "" (
+) else if "%~1" neq "" (
     call :%*
 )