Llewellyn/zoxide
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/zoxide.git synced 2024-11-13 00:36:34 +00:00
Code Issues Projects Releases Wiki Activity

Fix errors with set -eu (#302)

Browse Source
This commit is contained in:
Oliver Mannion 2021-11-20 07:22:15 +11:00 committed by GitHub
parent 9f2f2e978e
commit c392a8bb75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed ### Fixed
- PowerShell: use global scope for aliases. - PowerShell: use global scope for aliases.
- Zsh: fix errors with `set -eu`.
## [0.7.9] - 2021-11-02 ## [0.7.9] - 2021-11-02

4
src/shell.rs
View File

@ -222,7 +222,7 @@ mod tests {
let opts = Opts { cmd, hook, echo, resolve_symlinks }; let opts = Opts { cmd, hook, echo, resolve_symlinks };
let source = Posix(&opts).render().unwrap(); let source = Posix(&opts).render().unwrap();
let assert = Command::new("dash").args(&["-c", &source, "-e", "-u"]).assert().success().stderr(""); let assert = Command::new("dash").args(&["-e", "-u", "-c", &source]).assert().success().stderr("");
if opts.hook != InitHook::Pwd { if opts.hook != InitHook::Pwd {
assert.stdout(""); assert.stdout("");
} }
@ -380,7 +380,7 @@ mod tests {
let source = Zsh(&opts).render().unwrap(); let source = Zsh(&opts).render().unwrap();
Command::new("zsh") Command::new("zsh")
.args(&["-c", &source, "-e", "-u", "-o", "pipefail", "--no-globalrcs", "--no-rcs"]) .args(&["-e", "-u", "-o", "pipefail", "--no-globalrcs", "--no-rcs", "-c", &source])
.assert() .assert()
.success() .success()
.stdout("") .stdout("")

8
templates/zsh.txt
View File

@ -35,11 +35,11 @@ function __zoxide_hook() {
# Initialize hook. # Initialize hook.
# shellcheck disable=SC2154 # shellcheck disable=SC2154
if [[ ${precmd_functions[(Ie)__zoxide_hook]} -eq 0 ]] && [[ ${chpwd_functions[(Ie)__zoxide_hook]} -eq 0 ]]; then if [[ ${precmd_functions[(Ie)__zoxide_hook]:-} -eq 0 ]] && [[ ${chpwd_functions[(Ie)__zoxide_hook]:-} -eq 0 ]]; then
{%- if hook == InitHook::Prompt %} {%- if hook == InitHook::Prompt %}
precmd_functions+=(__zoxide_hook) precmd_functions+=(__zoxide_hook)
{%- else if hook == InitHook::Pwd %} {%- else if hook == InitHook::Pwd %}
chpwd_functions=("${chpwd_functions[@]}" "__zoxide_hook") chpwd_functions+=(__zoxide_hook)
{%- endif %} {%- endif %}
fi fi
@ -86,8 +86,8 @@ function __zoxide_zi() {
# Remove definitions. # Remove definitions.
function __zoxide_unset() { function __zoxide_unset() {
\builtin unalias "$@" &>/dev/null \builtin unalias "$@" &>/dev/null || true
\builtin unfunction "$@" &>/dev/null \builtin unfunction "$@" &>/dev/null || true
\builtin unset "$@" &>/dev/null \builtin unset "$@" &>/dev/null
} }