From 28bddb93898d28b8dad3c0219cca1b77b24812a0 Mon Sep 17 00:00:00 2001
From: mataha <mataha@users.noreply.github.com>
Date: Fri, 5 Jul 2024 01:15:44 +0200
Subject: [PATCH] Switch to labeled comments

---
 templates/cmd.txt | 59 +++++++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/templates/cmd.txt b/templates/cmd.txt
index 802b16c..d3e334b 100644
--- a/templates/cmd.txt
+++ b/templates/cmd.txt
@@ -1,22 +1,26 @@
-{%- let section = "rem ===========================================================================\nrem" -%}
-{%- let not_configured = "rem -- not configured --" -%}
-
-rem Code generated by zoxide. DO NOT EDIT.
+{%- let section = "::: ===========================================================================\n:::" -%}
+{%- let not_configured = "::: -- not configured --" -%}
 
 @if "%=^%=" == "%=%=" (set \p=%%<nul) else (set \p=^%<nul)
 
-set __program=zoxide
+set program=zoxide
 
-set __builtin_cd=chdir /d
-set __builtin_pwd=(chdir)
+set builtin_cd=chdir /d
+set builtin_pwd=(chdir)
+
+set builtin_true=call;
+set builtin_false=call
+
+::: Get Windows' system directory, like GetSystemDirectoryW.
+@if "" == "%SystemRoot%" (set sysdir="%__APPDIR__%") else (set sysdir="%SystemRoot%\system32\")
 
 {{ section }}
-rem Hook configuration for zoxide.
-rem
+::: Hook configuration for zoxide.
+:::
 
 {% if hook != InitHook::None -%}
-echo %__program%: hooks are not supported on cmd.exe shell.
-echo         Use '%__program% init cmd --hook none' instead.
+echo zoxide: hooks are not supported on cmd.exe shell.
+echo         Use '%program% init cmd --hook none' instead.
 
 {%- else -%}
 {{ not_configured }}
@@ -24,29 +28,28 @@ echo         Use '%__program% init cmd --hook none' instead.
 {%- endif %}
 
 {{ section }}
-rem Utility functions for zoxide.
-rem
+::: Utility functions for zoxide.
+:::
 
-rem pwd based on the value of _ZO_RESOLVE_SYMLINKS.
-set __zoxide_pwd= {%- if resolve_symlinks -%} (for /f "skip=9 tokens=1,2,*" %\p%j in ('^^^^^^^^""%SystemRoot%\system32\fsutil.exe" reparsepoint query .^"') do @if "%\p%~j" equ "Print" if "%\p%~k" equ "Name:" if "%\p%~l" neq "" (echo(%\p%~l)) ^^^^^^^|^^^^^^^| {%~ endif -%} %__builtin_pwd%
+::: pwd based on the value of _ZO_RESOLVE_SYMLINKS.
+set __zoxide_pwd= {%- if resolve_symlinks -%} (for /f "skip=9 tokens=1,2,*" %\p%j in ('^^^^^^^^"%sysdir%fsutil.exe reparsepoint query .^"') do @if "%\p%~j" equ "Print" if "%\p%~k" equ "Name:" if "%\p%~l" neq "" (echo(%\p%~l)) ^^^^^^^|^^^^^^^| {%~ endif -%} %builtin_pwd%
 
-rem cd + custom logic based on the value of _ZO_ECHO.
-set __zoxide_cd=if /i "%\p%CD%\p%" neq "%\p%~fc" (%__builtin_cd% "%\p%~fc" ^^^&^^^& set "OLDPWD=%\p%CD%\p%" ^^^&^^^& (for /f "delims=" %\p%l in ('"%__builtin_pwd%"') do @if /i "%\p%~fl" neq "%\p%~dpl" (%__program% add -- "%\p%~fl") else (%__program% add -- "%\p%~dpl\")) {%- if echo ~%} ^^^&^^^& %__zoxide_pwd% {%- endif ~%} ^^^&^^^& if defined CDCMD (call %\p%CDCMD%\p%))
+::: cd + custom logic based on the value of _ZO_ECHO.
+set __zoxide_cd=if /i "%\p%CD%\p%" neq "%\p%~fc" (%builtin_cd% "%\p%~fc" ^^^&^^^& set "OLDPWD=%\p%CD%\p%" ^^^&^^^& (for /f "delims=" %\p%l in ('"%builtin_pwd%"') do @if /i "%\p%~fl" neq "%\p%~dpl" (%program% add -- "%\p%~fl") else (%program% add -- "%\p%~dpl\")) {%- if echo ~%} ^^^&^^^& %__zoxide_pwd% {%- endif ~%} ^^^&^^^& if defined CDCMD (call %\p%CDCMD%\p%))
 
 {{ section }}
-rem Commands for zoxide. Disable these using --no-cmd.
-rem
+::: Commands for zoxide. Disable these using --no-cmd.
+:::
 
 {%- match cmd %}
 {%- when Some with (cmd) %}
 
-set __zoxide_command={{ cmd }}
+::: @TODO for args %* %1 etc., boundary checking 
+::: Jump to a directory using only keywords.
+%sysdir%doskey.exe {{ cmd }} = @(for %\p%^^^^ in ("") do @for /f "delims=" %\p%i in (^^""$*%\p%~^^"^") do @if "%\p%~i" equ "" (if "%\p%HOMEDRIVE%\p%%\p%HOMEPATH%\p%" equ "" (for /f "delims=" %\p%c in (^^""%\p%USERPROFILE%\p%"^") do @%__zoxide_cd%) else for /f "delims=" %\p%c in (^^""%\p%HOMEDRIVE%\p%%\p%HOMEPATH%\p%"^") do @%__zoxide_cd%) else if "%\p%~i" equ "~" (if "%\p%HOMEDRIVE%\p%%\p%HOMEPATH%\p%" equ "" (for /f "delims=" %\p%c in (^^""%\p%USERPROFILE%\p%"^") do @%__zoxide_cd%) else for /f "delims=" %\p%c in (^^""%\p%HOMEDRIVE%\p%%\p%HOMEPATH%\p%"^") do @%__zoxide_cd%) else if "%\p%~i" equ "-" (if defined OLDPWD (for /f "delims=" %\p%c in (^^""%\p%OLDPWD%\p%"^") do @%__zoxide_cd%) else ^>^&2 (echo(%program%: OLDPWD not set) ^& %builtin_false%) else for /f "delims=" %\p%~ in (^^"%\p%~i^") do @for /f "tokens=1,* delims=d" %\p%a in ("-%\p%~a~") do @if "%\p%b" neq "" (for /f "delims=" %\p%c in (^^""%\p%~f~"^") do @%__zoxide_cd%) else if /i "%\p%CD%\p%" neq "%\p%__CD__%\p%" (for /f "delims=" %\p%q in ('^^"%program% query --exclude "%\p%CD%\p%" -- %\p%~i^"') do @(for /f "delims=" %\p%c in (^^""%\p%~fq"^") do @%__zoxide_cd%)) else (for /f "delims=" %\p%q in ('^^"%program% query --exclude "%\p%__CD__%\p%\" -- %\p%~i^"') do @(for /f "delims=" %\p%c in (^^""%\p%~fq"^") do @%__zoxide_cd%))) ^&^& %builtin_true%
 
-rem Jump to a directory using only keywords.
-"%SystemRoot%\system32\doskey.exe" %__zoxide_command% = @(for %\p%^^^^ in ("") do @for /f "delims=" %\p%i in (^^""$*%\p%~^^"^") do @if "%\p%~i" equ "" (if "%\p%HOMEDRIVE%\p%%\p%HOMEPATH%\p%" equ "" (for /f "delims=" %\p%c in (^^""%\p%USERPROFILE%\p%"^") do @%__zoxide_cd%) else for /f "delims=" %\p%c in (^^""%\p%HOMEDRIVE%\p%%\p%HOMEPATH%\p%"^") do @%__zoxide_cd%) else if "%\p%~i" equ "~" (if "%\p%HOMEDRIVE%\p%%\p%HOMEPATH%\p%" equ "" (for /f "delims=" %\p%c in (^^""%\p%USERPROFILE%\p%"^") do @%__zoxide_cd%) else for /f "delims=" %\p%c in (^^""%\p%HOMEDRIVE%\p%%\p%HOMEPATH%\p%"^") do @%__zoxide_cd%) else if "%\p%~i" equ "-" (if defined OLDPWD (for /f "delims=" %\p%c in (^^""%\p%OLDPWD%\p%"^") do @%__zoxide_cd%) else ^>^&2 (echo(%__program%: OLDPWD not set) ^& call) else for /f "delims=" %\p%~ in (^^"%\p%~i^") do @for /f "tokens=1,* delims=d" %\p%a in ("-%\p%~a~") do @if "%\p%b" neq "" (for /f "delims=" %\p%c in (^^""%\p%~f~"^") do @%__zoxide_cd%) else if /i "%\p%CD%\p%" neq "%\p%__CD__%\p%" (for /f "delims=" %\p%q in ('^^"%__program% query --exclude "%\p%CD%\p%" -- %\p%~i^"') do @(for /f "delims=" %\p%c in (^^""%\p%~fq"^") do @%__zoxide_cd%)) else (for /f "delims=" %\p%q in ('^^"%__program% query --exclude "%\p%__CD__%\p%\" -- %\p%~i^"') do @(for /f "delims=" %\p%c in (^^""%\p%~fq"^") do @%__zoxide_cd%))) ^&^& call ;
-
-rem Jump to a directory using interactive search.
-"%SystemRoot%\system32\doskey.exe" %__zoxide_command%i = @(for %\p%^^^^ in ("") do @for /f "delims=" %\p%i in (^^""$*%\p%~^^"^") do @for /f "delims=" %\p%p in ('^^"%__program% query --interactive -- %\p%~i^"') do @for /f "delims=" %\p%c in (^^""%\p%~fp"^") do @%__zoxide_cd%) ^&^& call ;
+::: Jump to a directory using interactive search.
+%sysdir%doskey.exe {{ cmd }}i = @(for %\p%^^^^ in ("") do @for /f "delims=" %\p%i in (^^""$*%\p%~^^"^") do @for /f "delims=" %\p%p in ('^^"%program% query --interactive -- %\p%~i^"') do @for /f "delims=" %\p%c in (^^""%\p%~fp"^") do @%__zoxide_cd%) ^&^& %builtin_true%
 
 {%- when None %}
 
@@ -55,9 +58,9 @@ rem Jump to a directory using interactive search.
 {%- endmatch %}
 
 {{ section }}
-rem To initialize zoxide, add this to your configuration or AutoRun command:
-rem
-rem   zoxide init cmd | cmd /d/q/k echo off
+::: To initialize zoxide, add this to your configuration or AutoRun command:
+:::
+:::   zoxide init cmd | cmd /d/q/k echo off
 
 {#~
   Content piped to `cmd.exe` needs to end with an empty line to indicate end of