fix Monterey initialization issues

[ImgBot] Optimize images

README.cn.md

@@ -14,11 +14,11 @@ z.lua 是一个快速路径切换工具，它会跟踪你在 shell 下访问过
 
 - 性能比 **z.sh** 快三倍，比 **fasd** / **autojump** 快十倍以上。
 - 支持 Posix Shell：bash, zsh, dash, sh, ash, busybox 等等。
-- 支持 Fish Shell，Power Shell 和 Windows cmd。
-- 使用增强匹配算法，更准确的带你去到你想去的地方。
-- 低占用，能够仅在当前路径改变时才更新数据库（将 `$_ZL_ADD_ONCE` 设成 1）。
-- 交互选择模式，如果有多个匹配结果的话，跳转前允许你进行选择。
-- 集成 fzf （可选），可以用来做可视化选择或者参数补全。
+- 支持 Fish Shell，Power Shell 和 Windows cmd。
+- 使用增强匹配算法，更准确的带你去到你想去的地方。
+- 低占用，能够仅在当前路径改变时才更新数据库（将 `$_ZL_ADD_ONCE` 设成 1）。
+- 交互选择模式，如果有多个匹配结果的话，跳转前允许你进行选择。
+- 集成 fzf （可选），可以用来做可视化选择或者参数补全。
 - 快速跳转到父目录，或者项目根目录，代替反复 “cd ../../.." 。
 - 兼容 lua 5.1, 5.2 和 5.3 以上版本。
 - 自包含且无额外依赖，单个 `z.lua` 文件完成所有工作。
@@ -42,10 +42,10 @@ z -b foo    # 跳转到父目录中名称以 foo 开头的那一级
 
 ## Install
 
-- Posix Shells（Bash、zsh、dash、sh 或 BusyBox 等）：
-
-  在你的 `.bashrc`, `.zshrc` 或者 `.profile` 文件中按 shell 类型添加对应语句：
-
+- Posix Shells（Bash、zsh、dash、sh 或 BusyBox 等）：
+
+  在你的 `.bashrc`, `.zshrc` 或者 `.profile` 文件中按 shell 类型添加对应语句：
+
       eval "$(lua /path/to/z.lua  --init bash)"   # BASH 初始化
       eval "$(lua /path/to/z.lua  --init zsh)"    # ZSH 初始化
       eval "$(lua /path/to/z.lua  --init posix)"  # Posix shell 初始化
@@ -65,7 +65,12 @@ z -b foo    # 跳转到父目录中名称以 foo 开头的那一级
       antigen bundle skywind3000/z.lua
 
   就可以了（主要要放在 antigen apply 语句之前）。
+  
+  **注意**：使用 WSL-1 的用户，需要安装 `lua-filesystem` 包：
 
+      sudo apt-get install lua-filesystem
+
+  这是由于 wsl-1 的 [bug](https://github.com/microsoft/WSL/issues/5505) 引起的，使用 lua-filesystem 可以避免该问题。
 
 - Fish Shell:
 
@@ -79,18 +84,18 @@ z -b foo    # 跳转到父目录中名称以 foo 开头的那一级
 
   但是第二种方法需要记得在 z.lua 位置改变或者 lua 版本升级后需要重新生成。
 
-- Power Shell:
-
+- Power Shell:
+
   在你 Power Shell 的配置文件 `profile.ps1` 中放入下面语句：
 
-      iex ($(lua /path/to/z.lua --init powershell) -join "`n") 
+      Invoke-Expression (& { (lua /path/to/z.lua --init powershell) -join "`n" })
 
 
 - Windows cmd (with clink):
 
   - 将 z.lua 和 z.cmd 拷贝到 clink 的安装目录。
   - 将 clink 的安装目录添加到 `%PATH%` (z.cmd 可以被任意位置调用到)。
-  - 保证 lua 命令在你的 `%PATH%` 环境变量中。
+  - 保证 lua 命令在你的 `%PATH%` 环境变量中。
   
 
 - Windows cmder:
@@ -111,6 +116,7 @@ z -b foo    # 跳转到父目录中名称以 foo 开头的那一级
 - 设置 `$_ZL_CD` 用来指定你想用的 cd 命令，比如有人用 cd_func 。
 - 设置 `$_ZL_ECHO` 为 1 可以在跳转后显示目标路径名称。
 - 设置 `$_ZL_MATCH_MODE` 为 1 可以打开 “增强匹配模式”。
+- 设置 `$_ZL_HYPHEN` 为 1 可以允许关键字中包含横线 （横线默认是 lua 正则关键字，要转写成 `%-`）。
 
 ## Aging
 
@@ -161,7 +167,7 @@ Frecency 是一个由 'recent' 和 'frequency' 组成的合成词，这个术语
 
 对于一个给定的正则关键字序列（即 z 命令后面的参数），只有同时满足两个条件才算匹配成功：
 
-1. 正则关键字将按顺序进行匹配（这条和默认匹配法相同）。
+1. 正则关键字将按顺序进行匹配（这条和默认匹配法相同）。
 2. 最后一个关键字可以和路径名的最后一段相匹配。
 
 如果两条规则同时启用找不到任何结果，那么将会退回到只用规则 1 进行筛选，这两条规则是参考 fasd 引入的。
@@ -175,14 +181,14 @@ Frecency 是一个由 'recent' 和 'frequency' 组成的合成词，这个术语
       30   /home/user/workspace/project2
       40   /home/user/workspace/project3
 
-  在增强模式下使用 `"z wo"` 的话，只有 `/home/user/work` 满足匹配，因为按照第二条规则，这是唯一一条最有一段名称匹配 `wo` 的路径。
+  在增强模式下使用 `"z wo"` 的话，只有 `/home/user/workspace` 满足匹配，因为按照第二条规则，这是唯一一条最有一段名称匹配 `wo` 的路径。
 
   因为最后一级目录名称总是最容易记住的，所以给到它比较高的优先级。在默认匹配算法中，你同样可以用 `"z space$"` 来达到相同的目的，但是 `"z wo"` 可以打更少的字。
 
   小技巧: 
 
   - 如果你在增强匹配算法下，想让最后一个关键字不当匹配最后一段路径名，还可以像默认匹配算法中一样匹配路径的其他部分的话，你可以在最后加一个独立的 '$' 参数，比如：`"z wo $"`
-  - 如果你在增强匹配算法下，想让最后一个关键字匹配最后一段路径名以前的部分，那么可以增加一个斜杆参数，比如：`"z wo /"`。
+  - 如果你在增强匹配算法下，想让最后一个关键字匹配最后一段路径名以前的部分，那么可以增加一个斜杆参数，比如：`"z wo /"`。
   
 
 - 如果没法匹配，同时又存在一条路径名和关键字相同，那么 cd 过去:
@@ -265,7 +271,7 @@ PS：你可以使用 `$_ZL_FZF` 环境变量来精确指明 fzf 的可执行路
 
 `"-b"` 选项可以快速回到某一级父目录，避免重复的输入 "cd ../../.."。
 
-- **(没有参数)**：`cd` 到项目根目录，即跳转到最近的包含 (.git/.svn/.hg) 的父目录。
+- **(没有参数)**：`cd` 到项目根目录，即跳转到最近的包含 (.git/.svn/.hg) 的父目录。
 - **(单个参数)**：`cd` 到离当前目录最近的以关键字开头的父目录，如果找不到就尝试跳到包含关键字的父目录。
 - **(两个参数)**：将当前路径中的第一个关键词替换为第二个关键词。
 
@@ -302,6 +308,8 @@ export _ZL_ROOT_MARKERS=".git,.svn,.hg,.root,package.json"
 
 **Bonus**：`zb ..` 相当于 `cd ..`，`zb ...` 相当于 `cd ../..`，而 `zb ....` 相当于 `cd ../../..` 等等。 最后 `zb ..20` 等同于调用 `cd ..` 二十次。
 
+**Bonus**: 试试 `z -b -i` 以及 `z -b -I`，推荐把他们取个别名成 `zbi` 和 `zbf`。
+
 
 ## 补全功能
 

README.md

@@ -13,19 +13,29 @@ z.lua is a faster way to navigate your filesystem. It tracks your most used dire
 
 For example, `z foo bar` would match `/foo/bar` but not `/bar/foo`.
 
+## Reputation
+
+From people using z.lua:
+
+- I like this in principal. I’m pretty damn predictable at the command line and far too lazy to make shortcuts
+- It feels far more intuitive and it's so incredibly convenient to be able to jump between folders I'm working in without having to traverse an entire tree. The shell used to feel so constraining for me, but tools like this are making me enjoy it so much more. 
+- I can finally have autojump-like functionality on my Raspberry Pi 1 without waiting 30 seconds every time I open a new shell. Thanks z.lua devs.
+- Anyway, z.lua is a promising project. If you only need directory jumping, it may be the best choice.
+
 
 ## Features
 
 - **10x** times faster than **fasd** and **autojump**, **3x** times faster than **z.sh**.
+- Gain the ultimate speed with an optional [native module](https://github.com/skywind3000/czmod) written in C.
 - Available for **posix shells**: bash, zsh, dash, sh, ash, ksh, busybox and etc.
 - Available for Fish Shell, Power Shell and Windows cmd.
 - [Enhanced matching algorithm](#enhanced-matching) takes you to where ever you want precisely.
 - Allow updating database only if `$PWD` changed with "$_ZL_ADD_ONCE" set to 1.
 - Interactive selection enables you to choose where to go before cd.
-- Intergrated with FZF (optional) for interactive selection and completion.
+- Integrated with FZF (optional) for interactive selection and completion.
 - Quickly go back to a parent directory instead of typing "cd ../../..".
 - Corresponding experience in different shells and operating systems. 
-- Compatible with Lua 5.1, 5.2 and 5.3+
+- Compatible with Lua (5.1, 5.2, 5.3+) and luajit.
 - Self contained, distributed as a single `z.lua` script, no other dependence.
 
 
@@ -59,13 +69,19 @@ z -b foo    # cd to the parent directory starting with foo
 
   and perhaps this:
 
-      export _ZL_ECHO=1
+      eval "$(lua /path/to/z.lua --init bash enhanced once echo)"
 
   if you want `z.lua` print the new directory after cd. 
 
-  If you want `fzf` tab completion use:
+  For `fzf` tab completion use:
 
       eval "$(lua /path/to/z.lua --init bash enhanced once fzf)"
+  
+  **NOTE**: For wsl-1 users, `lua-filesystem` must be installed:
+
+      sudo apt-get install lua-filesystem
+
+  To avoid a wsl-1 [defect](https://github.com/microsoft/WSL/issues/5505).
 
 - Zsh:
 
@@ -75,6 +91,8 @@ z -b foo    # cd to the parent directory starting with foo
 
   Options like "enhanced" and "once" can be used after `--init` too. It can also be initialized from "skywind3000/z.lua" with your zsh plugin managers (antigen / oh-my-zsh).
 
+  **NOTE**: for wsl-1 users, `lua-filesystem` must be installed.
+
 - Posix Shells:
 
   put something like this in your `.profile`:
@@ -87,37 +105,45 @@ z -b foo    # cd to the parent directory starting with foo
 
   To generate old posix compatible script.
 
-- Fish Shell:
+- Fish Shell (version `2.4.0` or above):
 
   Create `~/.config/fish/conf.d/z.fish` with following code
 
-      source (lua /path/to/z.lua --init fish | psub)
+      lua /path/to/z.lua --init fish | source
 
-  Fish version `2.4.0` or above is required. 
+  If you'd like `z.lua` to cooperate with fish's own [directory history](https://fishshell.com/docs/3.2/index.html#id34), you can put
 
-      lua /path/to/z.lua --init fish > ~/.config/fish/conf.d/z.fish
+      set -gx _ZL_CD cd
 
-  This is another way to initialize z.lua in fish shell, but remember to regenerate z.fish if z.lua has been updated or moved.
+  into the same file.
 
 - Power Shell:
 
   put something like this in your `profile.ps1`:
 
-      iex ($(lua /path/to/z.lua --init powershell) -join "`n") 
-
+      Invoke-Expression (& { (lua /path/to/z.lua --init powershell) -join "`n" })
 
 - Windows cmd (with clink):
 
-  - copy z.lua and z.cmd to clink's home directory
+  - Copy z.lua and z.cmd to clink's home directory
   - Add clink's home to `%PATH%` (z.cmd can be called anywhere)
   - Ensure that "lua" can be called in `%PATH%`
 
 - Windows cmder:
 
-  - copy z.lua and z.cmd to cmder/vendor
+  - Copy z.lua and z.cmd to cmder/vendor
   - Add cmder/vendor to `%PATH%`
   - Ensure that "lua" can be called in `%PATH%`
 
+- Windows WSL-1:
+
+  Install `lua-filesystem` module before init z.lua:
+        
+        sudo apt-get install lua-filesystem
+
+  This module is required due to a wsl-1 [defect](https://github.com/microsoft/WSL/issues/5505).
+
+
 
 ## Options
 
@@ -127,10 +153,12 @@ z -b foo    # cd to the parent directory starting with foo
 - set `$_ZL_EXCLUDE_DIRS` to a comma separated list of dirs to exclude.
 - set `$_ZL_ADD_ONCE` to '1' to update database only if `$PWD` changed.
 - set `$_ZL_MAXAGE` to define a aging threshold (default is 5000).
-- set `$_ZL_CD` to specify your own cd command.
+- set `$_ZL_CD` to specify your own cd command (default is `builtin cd` in Unix shells).
 - set `$_ZL_ECHO` to 1 to display new directory name after cd.
 - set `$_ZL_MATCH_MODE` to 1 to enable enhanced matching.
 - set `$_ZL_NO_CHECK` to 1 to disable path validation, use `z --purge` to clean
+- set `$_ZL_HYPHEN` to 1 to treat hyphon (-) as a normal character not a lua regexp keyword.
+- set `$_ZL_CLINK_PROMPT_PRIORITY` change clink prompt register priority (default 99).
 
 ## Aging
 
@@ -195,7 +223,7 @@ If no match is found, it will fall back to default matching method.
       30   /home/user/workspace/project2
       40   /home/user/workspace/project3
 
-  If you use `"z wo"` in enhanced matching mode, only the `/home/user/work` will be matched, because according to rule No.2 it is the only path whose last segment matches `"wo"`.
+  If you use `"z wo"` in enhanced matching mode, only the `/home/user/workspace` will be matched, because according to rule No.2 it is the only path whose last segment matches `"wo"`.
 
   Since the last segment of a path is always easier to be recalled, it is sane to give it higher priority. You can also achieve this by typing `"z space$"` in both methods, but `"z wo"` is easier to type.
 
@@ -240,7 +268,7 @@ To enable this, you can set `$_ZL_ADD_ONCE` to `1` before init z.lua. Or you can
 ````bash
 eval "$(lua /path/to/z.lua --init bash once)"
 eval "$(lua /path/to/z.lua --init zsh once)"
-source (lua /path/to/z.lua --init fish once | psub)
+lua /path/to/z.lua --init fish once | source
 ````
 
 With `add once` mode off (default), z.lua will consider the time you spent in the directory (like z.sh). When this mode is on, consider the times you accessed the directory (like autojump), and that could be much faster on slow hardware. 
@@ -322,6 +350,7 @@ If you want `zb` jump back to a parent directory contains a `.root` or `package.
 
 **Bonus**: `zb ..` equals to `cd ..`, `zb ...` equals to `cd ../..` and `zb ....` equals to `cd ../../..`, and so on. Finally, `zb ..20` equals to `cd (..)x20`.
 
+**Bonus**: try `z -b -i` and `z -b -I` and you can alias them to `zbi` and `zbf`.
 
 ## Completion
 
@@ -446,18 +475,33 @@ sys     0m0.030s
 
 As you see, z.lua is the fastest one and requires less resource.
 
+## Native Module
 
+z.lua is fast enough for most case, the path tracking action will be triggered each time when you change your current directory.
 
-## Reputation
+So I still recommend the pure lua script for portability and flexibility, but for someone who really care about `10ms` or `1ms` things, this module can help them to gain the ultimate speed.
+
+- [czmod](https://github.com/skywind3000/czmod): native module to boost `z.lua`.
+
+Average performance:
+
+| Name | czmod |  z.lua |
+|-|-|-|
+| **Update Time** | 1.6ms | 13.2ms |
+| **Query Time** | 1.5ms | 9.8ms |
 
-- "I like this in principal. I’m pretty damn predictable at the command line and far too lazy to make shortcuts"
-- "It feels far more intuitive and it's so incredibly convenient to be able to jump between folders I'm working in without having to traverse an entire tree. The shell used to feel so constraining for me, but tools like this are making me enjoy it so much more. "
-- "I can finally have autojump-like functionality on my Raspberry Pi 1 without waiting 30 seconds every time I open a new shell. Thanks z.lua devs."
-- "Anyway, z.lua is a promising project. If you only need directory jumping, it may be the best choice."
 
 
 ## History
 
+- 1.8.7 (2020-06-29): use lfs or luajit's cffi if possible.
+- 1.8.4 (2020-02-10): fish shell: set `$_ZL_ECHO` to global scope.
+- 1.8.3 (2020-02-09): new: `z -b -i` and `z -b -I` to jump backwards in interactive mode.
+- 1.7.4 (2019-12-29): new: `$_ZL_HYPHEN` to treat hyphen as a normal character, see [here](https://github.com/skywind3000/z.lua/wiki/FAQ#how-to-input-a-hyphen---in-the-keyword-).
+- 1.7.3 (2019-09-07): use [lua-filesystem](http://keplerproject.github.io/luafilesystem/) package if possible when `$_ZL_USE_LFS` is `1`.
+- 1.7.2 (2019-08-01): Improve bash/zsh shell compatibility by [@barlik](https://github.com/barlik).
+- 1.7.1 (2019-06-07): Fixed: `$_ZL_DATA` failure on Linux sometimes.
+- 1.7.0 (2019-03-09): Support [ranger](https://github.com/skywind3000/z.lua/wiki/FAQ#how-to-integrate-zlua-to-ranger-), fix ReplaceFile issue in luajit (windows).
 - 1.6.0 (2019-03-04): optimize with ffi module (luajit builtin module).
 - 1.5.11 (2019-03-02): fixed: os.path.isdir doesn't work for symbol link folders.
 - 1.5.10 (2019-03-01): Prevent writing file racing.
@@ -509,6 +553,7 @@ This project needs help for the tasks below:
 - Thanks to [@TeddyDD](https://github.com/TeddyDD) for Fish Shell porting.
 - Thanks to [@manhong2112](https://github.com/manhong2112) for Power Shell porting.
 - Thanks to [@BarbUk](https://github.com/BarbUk) for fzf completion in Bash.
+- Thanks to [@barlik](https://github.com/barlik) for many improvements.
 
 And many others.
 

init.fish

@@ -17,11 +17,18 @@ end
 
 set -x _ZL_DATA "$_ZL_DATA"
 
-set _zlua_dir (dirname (status --current-filename))
+set -q XDG_DATA_HOME; or set XDG_DATA_HOME ~/.local/share
+if functions -q fisher
+	set _zlua_dir $XDG_DATA_HOME/fisher/github.com/skywind3000/z.lua
+else
+	set _zlua_dir (dirname (status --current-filename))
+end
 
 if test -e $_zlua_dir/z.lua 
 	if type -q lua
 		lua $_zlua_dir/z.lua --init fish enhanced once echo | source
+	else if type -q luajit
+		luajit $_zlua_dir/z.lua --init fish enhanced once echo | source
 	else if type -q lua5.3
 		lua5.3 $_zlua_dir/z.lua --init fish enhanced once echo | source
 	else if type -q lua5.2
@@ -35,6 +42,8 @@ if test -e $_zlua_dir/z.lua
 	alias zz='z -i'      # cd with interactive selection
 	alias zf='z -I'      # use fzf to select in multiple matches
 	alias zb='z -b'      # quickly cd to the parent directory
+	alias zbi='z -b -i'  # interactive jump backward
+	alias zbf='z -b -I'  # interactive jump backward with fzf
 	set -U ZLUA_SCRIPT "$ZLUA_SCRIPT"  2> /dev/null
 	set -U ZLUA_LUAEXE "$ZLUA_LUAEXE"  2> /dev/null
 end

ranger_zlua.py

@@ -0,0 +1,87 @@
+import time, sys, os
+import ranger.api
+import subprocess
+
+old_hook_init = ranger.api.hook_init
+
+PATH_LUA = os.environ.get('RANGER_LUA')
+PATH_ZLUA = os.environ.get('RANGER_ZLUA')
+
+if not PATH_LUA:
+    for path in os.environ.get('PATH', '').split(os.path.pathsep):
+        for name in ('lua', 'luajit', 'lua5.3', 'lua5.2', 'lua5.1'):
+            test = os.path.join(path, name)
+            test = test + (sys.platform[:3] == 'win' and ".exe" or "")
+            if os.path.exists(test):
+                PATH_LUA = test
+                break
+
+if not PATH_LUA:
+    sys.stderr.write('Please install lua or set $RANGER_LUA.\n')
+    sys.exit()
+
+if (not PATH_ZLUA) or (not os.path.exists(PATH_ZLUA)):
+    sys.stderr.write('Not find z.lua, please set $RANGER_ZLUA to absolute path of z.lua.\n')
+    sys.exit()
+
+            
+def hook_init(fm):
+    def update_zlua(signal):
+        import os, random
+        os.environ['_ZL_RANDOM'] = str(random.randint(0, 0x7fffffff))
+        p = subprocess.Popen([PATH_LUA, PATH_ZLUA, "--add", signal.new.path])
+        p.wait()
+    if PATH_ZLUA and PATH_LUA and os.path.exists(PATH_ZLUA):
+        fm.signal_bind('cd', update_zlua)
+    return old_hook_init(fm)
+
+ranger.api.hook_init = hook_init
+
+class z(ranger.api.commands.Command):
+    def execute (self):
+        import sys, os, time
+        args = self.args[1:]
+        if args:
+            mode = ''
+            for arg in args:
+                if arg in ('-l', '-e', '-x', '-h', '--help', '--'):
+                    mode = arg
+                    break
+                elif arg in ('-I', '-i'):
+                    mode = arg
+                elif arg[:1] != '-':
+                    break
+            if mode:
+                cmd = '"%s" "%s" '%(PATH_LUA, PATH_ZLUA)
+                if mode in ('-I', '-i', '--'):
+                    cmd += ' --cd'
+                for arg in args:
+                    cmd += ' "%s"'%arg
+                if mode in ('-e', '-x'):
+                    path = subprocess.check_output([PATH_LUA, PATH_ZLUA, '--cd'] + args)
+                    path = path.decode("utf-8", "ignore")
+                    path = path.rstrip('\n')
+                    self.fm.notify(path)
+                elif mode in ('-h', '-l', '--help'):
+                    p = self.fm.execute_command(cmd + '| less +G', universal_newlines=True)
+                    stdout, stderr = p.communicate()
+                elif mode == '--':
+                    p = self.fm.execute_command(cmd + ' 2>&1 | less +G', universal_newlines=True)
+                    stdout, stderr = p.communicate()
+                else:
+                    p = self.fm.execute_command(cmd, universal_newlines=True, stdout=subprocess.PIPE)
+                    stdout, stderr = p.communicate()
+                    path = stdout.rstrip('\n')
+                    self.fm.execute_console('redraw_window')
+                    if path and os.path.exists(path):
+                        self.fm.cd(path)
+            else:
+                path = subprocess.check_output([PATH_LUA, PATH_ZLUA, '--cd'] + args)
+                path = path.decode("utf-8", "ignore")
+                path = path.rstrip('\n')
+                if path and os.path.exists(path):
+                    self.fm.cd(path)
+                else:
+                    self.fm.notify('No matching found', bad = True)
+        return True
+

z.cmd

@@ -54,6 +54,12 @@ if /i "%1"=="-x" (
 	goto parse
 )
 
+if /i "%1"=="--add" (
+	set "RunMode=--add"
+	shift /1
+	goto parse
+)
+
 if "%1"=="-i" (
 	set "InterMode=-i"
 	shift /1
@@ -100,13 +106,27 @@ if /i "%RunMode%"=="-n" (
 			pushd !NewPath!
 			pushd !NewPath!
 			endlocal
-			popd
+			goto popdir
 		)
 	)
 )	else (
 	call "%LuaExe%" "%LuaScript%" "%RunMode%" %MatchType% %StrictSub% %InterMode% %StripMode% %*
 )
 
+goto end
+
+:popdir
+rem -- Exploits variable expansion and the pushd stack to set the current
+rem -- directory without leaking a pushd.
+popd
+setlocal
+set "NewPath=%CD%"
+set "CDCmd=cd /d"
+if /i not "%_ZL_CD%"=="" (
+	set "CDCmd=%_ZL_CD%"
+)
+endlocal & popd & %CDCmd% "%NewPath%"
+
 :end
 echo.
 

z.lua

@@ -1,10 +1,10 @@
 #! /usr/bin/env lua
 --=====================================================================
 --
--- z.lua - a cd command that learns, by skywind 2018, 2019
+-- z.lua - a cd command that learns, by skywind 2018-2022
 -- Licensed under MIT license.
 --
--- Version 1.6.0, Last Modified: 2019/03/04 14:47
+-- Version 1.8.15, Last Modified: 2022/03/27 21:38
 --
 -- * 10x faster than fasd and autojump, 3x faster than z.sh
 -- * available for posix shells: bash, zsh, sh, ash, dash, busybox
@@ -49,9 +49,9 @@
 --         source (lua /path/to/z.lua --init fish | psub)
 --
 -- Power Shell Install:
---
 --     * put something like this in your config file:
---         iex ($(lua /path/to/z.lua --init powershell) -join "`n")
+--         Invoke-Expression (& { 
+--           (lua /path/to/z.lua --init powershell) -join "`n" })
 --
 -- Windows Install (with Clink):
 --     * copy z.lua and z.cmd to clink's home directory
@@ -63,6 +63,10 @@
 --     * Add cmder/vendor to %PATH%
 --     * Ensure that "lua" can be called in %PATH%
 --
+-- Windows WSL-1:
+--     * Install lua-filesystem module before init z.lua:
+--         sudo apt-get install lua-filesystem
+--
 -- Configure (optional):
 --   set $_ZL_CMD in .bashrc/.zshrc to change the command (default z).
 --   set $_ZL_DATA in .bashrc/.zshrc to change the datafile (default ~/.zlua).
@@ -74,6 +78,8 @@
 --   set $_ZL_MAXAGE to define a aging threshold (default is 5000).
 --   set $_ZL_MATCH_MODE to 1 to enable enhanced matching mode.
 --   set $_ZL_NO_CHECK to 1 to disable path validation. z --purge to clear.
+--   set $_ZL_USE_LFS to 1 to use lua-filesystem package
+--   set $_ZL_HYPHEN to 1 to stop treating hyphen as a regexp keyword
 --
 --=====================================================================
 
@@ -120,6 +126,7 @@ Z_CMD = 'z'
 Z_MATCHMODE = 0
 Z_MATCHNAME = false
 Z_SKIPPWD = false
+Z_HYPHEN = false
 
 os.LOG_NAME = os.getenv('_ZL_LOG_NAME')
 
@@ -316,14 +323,16 @@ if os.native.status then
 		uint32_t GetTickCount(void);
 		uint32_t GetFileAttributesA(const char *name);
 		uint32_t GetCurrentDirectoryA(uint32_t size, char *ptr);
+		uint32_t GetShortPathNameA(const char *longname, char *shortname, uint32_t size);
+		uint32_t GetLongPathNameA(const char *shortname, char *longname, uint32_t size);
 		]]
 		local kernel32 = ffi.load('kernel32.dll')
-		local buffer = ffi.new('char[?]', 300)
+		local buffer = ffi.new('char[?]', 4100)
 		local INVALID_FILE_ATTRIBUTES = 0xffffffff
 		local FILE_ATTRIBUTE_DIRECTORY = 0x10
 		os.native.kernel32 = kernel32
 		function os.native.GetFullPathName(name)
-			local hr = kernel32.GetFullPathNameA(name, 290, buffer, nil)
+			local hr = kernel32.GetFullPathNameA(name, 4096, buffer, nil)
 			return (hr > 0) and ffi.string(buffer, hr) or nil
 		end
 		function os.native.ReplaceFile(replaced, replacement)
@@ -336,6 +345,21 @@ if os.native.status then
 		function os.native.GetFileAttributes(name)
 			return kernel32.GetFileAttributesA(name)
 		end
+		function os.native.GetLongPathName(name)
+			local hr = kernel32.GetLongPathNameA(name, buffer, 4096)
+			return (hr ~= 0) and ffi.string(buffer, hr) or nil
+		end
+		function os.native.GetShortPathName(name)
+			local hr = kernel32.GetShortPathNameA(name, buffer, 4096)
+			return (hr ~= 0) and ffi.string(buffer, hr) or nil
+		end
+		function os.native.GetRealPathName(name)
+			local short = os.native.GetShortPathName(name)
+			if short then
+				return os.native.GetLongPathName(short)
+			end
+			return nil
+		end
 		function os.native.exists(name)
 			local attr = os.native.GetFileAttributes(name)
 			return attr ~= INVALID_FILE_ATTRIBUTES
@@ -349,7 +373,7 @@ if os.native.status then
 			return (attr % (2 * isdir)) >= isdir
 		end
 		function os.native.getcwd()
-			local hr = kernel32.GetCurrentDirectoryA(299, buffer)
+			local hr = kernel32.GetCurrentDirectoryA(4096, buffer)
 			if hr <= 0 then return nil end
 			return ffi.string(buffer, hr)
 		end
@@ -503,13 +527,16 @@ function os.path.abspath(path)
 				return test
 			end
 		end
-		for _, python in pairs({'python', 'python2', 'python3'}) do
+		for _, python in pairs({'python3', 'python2', 'python'}) do
 			local s = 'sys.stdout.write(os.path.abspath(sys.argv[1]))'
 			local s = '-c "import os, sys;' .. s .. '" \'' .. path .. '\''
 			local s = python .. ' ' .. s
 			local test = os.path.which(python)
 			if test ~= nil and test ~= '' then
-				return os.call(s)
+				test = os.call(s)
+				if test ~= nil and test ~= '' then
+					return test
+				end
 			end
 		end
 	end
@@ -548,9 +575,15 @@ end
 -- file or path exists
 -----------------------------------------------------------------------
 function os.path.exists(name)
+	if name == '/' then
+		return true
+	end
+	if os.native and os.native.exists then
+		return os.native.exists(name)
+	end
 	local ok, err, code = os.rename(name, name)
 	if not ok then
-		if code == 13 then
+		if code == 13 or code == 17 then
 			return true
 		elseif code == 30 then
 			local f = io.open(name,"r")
@@ -1106,7 +1139,10 @@ function data_save(filename, M)
 	fp:close()
 	if tmpname ~= nil then
 		if windows then
-			os.native.ReplaceFile(filename, tmpname)
+			local ok, err, code = os.rename(tmpname, filename)
+			if not ok then
+				os.native.ReplaceFile(filename, tmpname)
+			end
 		else
 			os.rename(tmpname, filename)
 		end
@@ -1260,6 +1296,9 @@ function data_select(M, patterns, matchlast)
 	local pats = {}
 	for i = 1, #patterns do
 		local p = patterns[i]
+		if Z_HYPHEN then
+			p = p:gsub('-', '%%-')
+		end
 		table.insert(pats, case_insensitive_pattern(p))
 	end
 	for i = 1, #M do
@@ -1345,6 +1384,14 @@ function z_add(path)
 				end
 			end
 			if not skip then
+				if windows then
+					if os.native and os.native.GetRealPathName then
+						local ts = os.native.GetRealPathName(path)
+						if ts then
+							path = ts
+						end
+					end
+				end
 				M = data_insert(M, path)
 				count = count + 1
 			end
@@ -1573,7 +1620,7 @@ function z_cd(patterns)
 		io.stderr:write('> ')
 		io.stderr:flush()
 		local input = io.read('*l')
-		if input == nil then
+		if input == nil or input == '' then
 			return nil
 		end
 		local index = tonumber(input)
@@ -1755,6 +1802,91 @@ function cd_minus(args, options)
 end
 
 
+-----------------------------------------------------------------------
+-- cd breadcrumbs: z -b -i, z -b -I
+-----------------------------------------------------------------------
+function cd_breadcrumbs(pwd, interactive)
+	local pwd = (pwd == nil or pwd == '') and os.pwd() or pwd
+	local pwd = os.path.normpath(pwd)
+	local path, _ = os.path.split(pwd)
+	local elements = {}
+	local interactive = interactive and interactive or 1
+	local fullname = os.environ('_ZL_FULL_PATH', false)
+	while true do
+		local head, name = os.path.split(path)
+		if head == path  then		-- reached root
+			table.insert(elements, {head, head})
+			break
+		elseif name ~= '' then
+			table.insert(elements, {name, path})
+		else
+			break
+		end
+		path = head
+	end
+	local tmpname = '/tmp/zlua.txt'
+	local fp = io.stderr
+	if interactive == 2 then
+		if not windows then
+			tmpname = os.tmpname()
+		else
+			tmpname = os.tmpname():gsub('\\', ''):gsub('%.', '')
+			tmpname = os.environ('TMP', '') .. '\\zlua_' .. tmpname .. '.txt'
+		end
+		fp = io.open(tmpname, 'w')
+	end
+	-- print table
+	local maxsize = string.len(tostring(#elements))
+	for i = #elements, 1, -1 do
+		local item = elements[i]
+		local name = item[1]
+		local text = string.rep(' ', maxsize - string.len(i)) .. tostring(i)
+		text = text .. ': ' .. (fullname and item[2] or item[1])
+		fp:write(text .. '\n')
+	end
+	if fp ~= io.stderr then
+		fp:close()
+	end
+	local retval = ''
+	-- select from stdin or fzf
+	if interactive == 1 then
+		io.stderr:write('> ')
+		io.stderr:flush()
+		retval = io.read('*l')
+	elseif interactive == 2 then
+		local fzf = os.environ('_ZL_FZF', 'fzf')
+		local cmd = '--reverse --inline-info --tac '
+		local flag = os.environ('_ZL_FZF_FLAG', '')
+		flag = (flag == '' or flag == nil) and '+s -e' or flag
+		cmd = ((fzf == '') and 'fzf' or fzf) .. ' ' .. cmd .. ' ' .. flag
+		if not windows then
+			local height = os.environ('_ZL_FZF_HEIGHT', '35%')
+			if height ~= nil and height ~= '' and height ~= '0' then
+				cmd = cmd .. ' --height ' .. height
+			end
+			cmd = cmd .. '< "' .. tmpname .. '"'
+		else
+			cmd = 'type "' .. tmpname .. '" | ' .. cmd
+		end
+		retval = os.call(cmd)
+		os.remove(tmpname)
+		if retval == '' or retval == nil then
+			return nil
+		end
+		local pos = retval:find(':')
+		if not pos then
+			return nil
+		end
+		retval = retval:sub(1, pos - 1):gsub('^%s*', '')
+	end
+	local index = tonumber(retval)
+	if index == nil or index < 1 or index > #elements then
+		return nil
+	end
+	return elements[index][2]
+end
+
+
 -----------------------------------------------------------------------
 -- main entry
 -----------------------------------------------------------------------
@@ -1789,7 +1921,11 @@ function main(argv)
 	if options['--cd'] or options['-e'] then
 		local path = ''
 		if options['-b'] then
-			path = cd_backward(args, options)
+			if Z_INTERACTIVE == 0 then
+				path = cd_backward(args, options)
+			else
+				path = cd_breadcrumbs('', Z_INTERACTIVE)
+			end
 		elseif options['-'] then
 			path = cd_minus(args, options)
 		elseif #args == 0 then
@@ -1826,6 +1962,8 @@ function main(argv)
 			z_windows_init(opts)
 		elseif opts.fish then
 			z_fish_init(opts)
+		elseif opts.powershell then
+		       z_windows_init(opts)
 		else
 			z_shell_init(opts)
 		end
@@ -1861,16 +1999,14 @@ function z_init()
 	local _zl_matchname = os.getenv('_ZL_MATCH_NAME')
 	local _zl_skippwd = os.getenv('_ZL_SKIP_PWD')
 	local _zl_matchmode = os.getenv('_ZL_MATCH_MODE')
+	local _zl_hyphen = os.getenv('_ZL_HYPHEN')
 	if _zl_data ~= nil and _zl_data ~= "" then
 		if windows then
 			DATA_FILE = _zl_data
 		else
 			-- avoid windows environments affect cygwin & msys
-			if _zl_data:sub(2, 2) ~= ':' then
-				local t = _zl_data:sub(3, 3)
-				if t ~= '/' and t ~= "\\" then
-					DATA_FILE = _zl_data
-				end
+			if not string.match(_zl_data, '^%a:[/\\]') then
+				DATA_FILE = _zl_data
 			end
 		end
 	end
@@ -1916,6 +2052,12 @@ function z_init()
 			Z_SKIPPWD = true
 		end
 	end
+	if _zl_hyphen ~= nil then
+		local m = string.lower(_zl_hyphen)
+		if (m == '1' or m == 'yes' or m == 'true' or m == 't') then
+			Z_HYPHEN = true
+		end
+	end
 end
 
 
@@ -1924,6 +2066,7 @@ end
 -----------------------------------------------------------------------
 function z_clink_init()
 	local once = os.environ("_ZL_ADD_ONCE", false)
+	local _zl_clink_prompt_priority = os.environ('_ZL_CLINK_PROMPT_PRIORITY', 99)
 	local previous = ''
 	function z_add_to_database()
 		pwd = clink.get_cwd()
@@ -1935,7 +2078,7 @@ function z_clink_init()
 		end
 		z_add(clink.get_cwd())
 	end
-	clink.prompt.register_filter(z_add_to_database, 99)
+	clink.prompt.register_filter(z_add_to_database, _zl_clink_prompt_priority)
 	function z_match_completion(word)
 		local M = z_match({word}, Z_METHOD, Z_SUBDIR)
 		for _, item in pairs(M) do
@@ -1945,6 +2088,8 @@ function z_clink_init()
 	end
 	local z_parser = clink.arg.new_parser()
 	z_parser:set_arguments({ z_match_completion })
+	z_parser:set_flags("-c", "-r", "-i", "--cd", "-e", "-b", "--add", "-x", "--purge", 
+		"--init", "-l", "-s", "--complete", "--help", "-h")
 	clink.arg.register_parser("z", z_parser)
 end
 
@@ -2010,14 +2155,14 @@ alias ${_ZL_CMD:-z}='_zlua'
 local script_init_bash = [[
 case "$PROMPT_COMMAND" in
 	*_zlua?--add*) ;;
-	*) PROMPT_COMMAND="(_zlua --add \"\$(command pwd 2>/dev/null)\" &);$PROMPT_COMMAND" ;;
+	*) PROMPT_COMMAND="(_zlua --add \"\$(command pwd 2>/dev/null)\" &)${PROMPT_COMMAND:+;$PROMPT_COMMAND}" ;;
 esac
 ]]
 
 local script_init_bash_fast = [[
 case "$PROMPT_COMMAND" in
 	*_zlua?--add*) ;;
-	*) PROMPT_COMMAND="(_zlua --add \"\$PWD\" &);$PROMPT_COMMAND" ;;
+	*) PROMPT_COMMAND="(_zlua --add \"\$PWD\" &)${PROMPT_COMMAND:+;$PROMPT_COMMAND}" ;;
 esac
 ]]
 
@@ -2029,7 +2174,7 @@ _zlua_precmd() {
 }
 case "$PROMPT_COMMAND" in
 	*_zlua_precmd*) ;;
-	*) PROMPT_COMMAND="_zlua_precmd;$PROMPT_COMMAND" ;;
+	*) PROMPT_COMMAND="_zlua_precmd${PROMPT_COMMAND:+;$PROMPT_COMMAND}" ;;
 esac
 ]]
 
@@ -2056,7 +2201,7 @@ local script_init_zsh = [[
 _zlua_precmd() {
 	(_zlua --add "${PWD:a}" &)
 }
-typeset -gaU precmd_functions
+typeset -ga precmd_functions
 [ -n "${precmd_functions[(r)_zlua_precmd]}" ] || {
 	precmd_functions[$(($#precmd_functions+1))]=_zlua_precmd
 }
@@ -2066,7 +2211,7 @@ local script_init_zsh_once = [[
 _zlua_precmd() {
 	(_zlua --add "${PWD:a}" &)
 }
-typeset -gaU chpwd_functions
+typeset -ga chpwd_functions
 [ -n "${chpwd_functions[(r)_zlua_precmd]}" ] || {
 	chpwd_functions[$(($#chpwd_functions+1))]=_zlua_precmd
 }
@@ -2096,16 +2241,16 @@ fi
 local script_complete_zsh = [[
 _zlua_zsh_tab_completion() {
 	# tab completion
-	local compl
-	read -l compl
 	(( $+compstate )) && compstate[insert]=menu # no expand
-	reply=(${(f)"$(_zlua --complete "$compl")"})
+	local -a tmp=(${(f)"$(_zlua --complete "${words/_zlua/z}")"})
+	_describe "directory" tmp -U
 }
-compctl -U -K _zlua_zsh_tab_completion _zlua
+if [ "${+functions[compdef]}" -ne 0 ]; then
+	compdef _zlua_zsh_tab_completion _zlua 2> /dev/null
+fi
 ]]
 
 
-
 -----------------------------------------------------------------------
 -- initialize bash/zsh
 ----------------------------------------------------------------------
@@ -2126,6 +2271,10 @@ function z_shell_init(opts)
 	local prompt_hook = (not os.environ("_ZL_NO_PROMPT_COMMAND", false))
 	local once = os.environ("_ZL_ADD_ONCE", false) or opts.once ~= nil
 
+	if opts.clean ~= nil then
+		prompt_hook = false
+	end
+
 	if opts.bash ~= nil then
 		if prompt_hook then
 			if once then
@@ -2295,18 +2444,24 @@ function z_fish_init(opts)
 	print('set -x ZLUA_SCRIPT "' .. os.scriptname() .. '"')
 	print('set -x ZLUA_LUAEXE "' .. os.interpreter() .. '"')
 	local once = (os.getenv("_ZL_ADD_ONCE") ~= nil) or opts.once ~= nil
+	local prompt_hook = (not os.environ("_ZL_NO_PROMPT_COMMAND", false))
+	if opts.clean ~= nil then
+		prompt_hook = false
+	end
 	print(script_zlua_fish)
-	if once then
-		print(script_init_fish_once)
-	else
-		print(script_init_fish)
+	if prompt_hook then
+		if once then
+			print(script_init_fish_once)
+		else
+			print(script_init_fish)
+		end
 	end
 	print(script_complete_fish)
 	if opts.enhanced ~= nil then
 		print('set -x _ZL_MATCH_MODE 1')
 	end
 	if opts.echo then
-		print('set _ZL_ECHO 1')
+		print('set -g _ZL_ECHO 1')
 	end
 	if opts.nc then
 		print('set -x _ZL_NO_CHECK 1')
@@ -2357,6 +2512,11 @@ if /i "%1"=="-x" (
 	shift /1
 	goto parse
 )
+if /i "%1"=="--add" (
+	set "RunMode=--add"
+	shift /1
+	goto parse
+)
 if "%1"=="-i" (
 	set "InterMode=-i"
 	shift /1
@@ -2395,12 +2555,22 @@ if /i "%RunMode%"=="-n" (
 			pushd !NewPath!
 			pushd !NewPath!
 			endlocal
-			popd
+			goto popdir
 		)
 	)
 )	else (
 	call "%LuaExe%" "%LuaScript%" "%RunMode%" %MatchType% %StrictSub% %InterMode% %StripMode% %*
 )
+goto end
+:popdir
+popd
+setlocal
+set "NewPath=%CD%"
+set "CDCmd=cd /d"
+if /i not "%_ZL_CD%"=="" (
+	set "CDCmd=%_ZL_CD%"
+)
+endlocal & popd & %CDCmd% "%NewPath%"
 :end
 ]]
 
@@ -2489,6 +2659,10 @@ if (!$env:_ZL_NO_PROMPT_COMMAND -and (!$global:_zlua_inited)) {
 -- initialize cmd/powershell
 -----------------------------------------------------------------------
 function z_windows_init(opts)
+	local prompt_hook = (not os.environ("_ZL_NO_PROMPT_COMMAND", false))
+	if opts.clean ~= nil then
+		prompt_hook = false
+	end
 	if opts.powershell ~= nil then
 		print('$script:ZLUA_LUAEXE = "' .. os.interpreter() .. '"')
 		print('$script:ZLUA_SCRIPT = "' .. os.scriptname() .. '"')
@@ -2505,7 +2679,9 @@ function z_windows_init(opts)
 		if opts.nc ~= nil then
 			print('$env:_ZL_NO_CHECK = 1')
 		end
-		print(script_init_powershell)
+		if prompt_hook then
+			print(script_init_powershell)
+		end
 	else
 		print('@echo off')
 		print('setlocal EnableDelayedExpansion')
@@ -2539,7 +2715,34 @@ end
 
 
 -----------------------------------------------------------------------
--- testing case
+-- LFS optimize
+-----------------------------------------------------------------------
+os.lfs = {}
+os.lfs.enable = os.getenv('_ZL_USE_LFS')
+os.lfs.enable = '1'
+if os.lfs.enable ~= nil then
+	local m = string.lower(os.lfs.enable)
+	if (m == '1' or m == 'yes' or m == 'true' or m == 't') then
+		os.lfs.status, os.lfs.pkg = pcall(require, 'lfs')
+		if os.lfs.status then
+			local lfs = os.lfs.pkg
+			os.path.exists = function (name)
+				return lfs.attributes(name) and true or false
+			end
+			os.path.isdir = function (name)
+				local mode = lfs.attributes(name)
+				if not mode then 
+					return false
+				end
+				return (mode.mode == 'directory') and true or false
+			end
+		end
+	end
+end
+
+
+-----------------------------------------------------------------------
+-- program entry
 -----------------------------------------------------------------------
 if not pcall(debug.getlocal, 4, 1) then
 	-- main script
@@ -2551,5 +2754,5 @@ if not pcall(debug.getlocal, 4, 1) then
 	end
 end
 
-
+-- vim: set ts=4 sw=4 tw=0 noet :
 

z.lua.plugin.zsh

@@ -2,33 +2,34 @@
 
 ZLUA_SCRIPT="${0:A:h}/z.lua"
 
-[[ -n "$ZLUA_EXEC" ]] && [[ ! -x "$ZLUA_EXEC" ]] && ZLUA_EXEC=""
+if [[ -n "$ZLUA_EXEC" ]] && ! which "$ZLUA_EXEC" &>/dev/null; then
+    echo "$ZLUA_EXEC not found"
+    ZLUA_EXEC=""
+fi
 
 # search lua executable
 if [[ -z "$ZLUA_EXEC" ]]; then
-	if [[ -x "$(command which lua)" ]]; then
-		ZLUA_EXEC="$(command which lua)"
-	elif [[ -x "$(command which lua5.3)" ]]; then
-		ZLUA_EXEC="$(command which lua5.3)"
-	elif [[ -x "$(command which lua5.2)" ]]; then
-		ZLUA_EXEC="$(command which lua5.2)"
-	elif [[ -x "$(command which lua5.1)" ]]; then
-		ZLUA_EXEC="$(command which lua5.1)"
-	else
+	for lua in lua luajit lua5.4 lua5.3 lua5.2 lua5.1; do
+		ZLUA_EXEC="$(command -v "$lua")"
+		[[ -n "$ZLUA_EXEC" ]] && break
+	done
+	if [[ -z "$ZLUA_EXEC" ]]; then
 		echo "Not find lua in your $PATH, please install it."
 		return
 	fi
 fi
 
-export _ZL_FZF_FLAG="-e"
+export _ZL_FZF_FLAG=${_ZL_FZF_FLAG:-"-e"}
 
 eval "$($ZLUA_EXEC $ZLUA_SCRIPT --init zsh once enhanced)"
 
-
-alias zz='z -i'
-alias zc='z -c'
-alias zf='z -I'
-alias zb='z -b'
-alias zh='z -I -t .'
-alias zzc='zz -c'
-
+if [[ -z "$_ZL_NO_ALIASES" ]]; then
+  alias zz='z -i'
+  alias zc='z -c'
+  alias zf='z -I'
+  alias zb='z -b'
+  alias zbi='z -b -i'
+  alias zbf='z -b -I'
+  alias zh='z -I -t .'
+  alias zzc='zz -c'
+fi