From 4b750cb72f3b6b72d6a835511fc1b11faac8b3cc Mon Sep 17 00:00:00 2001 From: Eric Nielsen Date: Thu, 12 Dec 2019 09:00:19 -0500 Subject: [PATCH] Fix zimfw failing in termux with NO_CASE_GLOB that is set by the completion module. This is a known still unsolved issue with termux. See https://github.com/termux/termux-packages/issues/1894 --- src/stage1/50_zimfw_compile.zsh.erb | 2 +- src/stage2/30_zmodule.zsh.erb | 2 +- zimfw.zsh | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/stage1/50_zimfw_compile.zsh.erb b/src/stage1/50_zimfw_compile.zsh.erb index 01ae6b8..861dc4e 100644 --- a/src/stage1/50_zimfw_compile.zsh.erb +++ b/src/stage1/50_zimfw_compile.zsh.erb @@ -1,5 +1,5 @@ _zimfw_compile() { - setopt LOCAL_OPTIONS EXTENDED_GLOB + setopt LOCAL_OPTIONS CASE_GLOB EXTENDED_GLOB autoload -U zrecompile local zdumpfile zdir zfile diff --git a/src/stage2/30_zmodule.zsh.erb b/src/stage2/30_zmodule.zsh.erb index 682519b..274a3eb 100644 --- a/src/stage2/30_zmodule.zsh.erb +++ b/src/stage2/30_zmodule.zsh.erb @@ -22,7 +22,7 @@ Startup options: _zfailed=1 return 1 fi - setopt LOCAL_OPTIONS EXTENDED_GLOB + setopt LOCAL_OPTIONS CASE_GLOB EXTENDED_GLOB local zmodule=${1:t} zurl=${1} local ztype=branch zrev=master local -i zdisabled=0 zfrozen=0 diff --git a/zimfw.zsh b/zimfw.zsh index 70c226b..36e607b 100644 --- a/zimfw.zsh +++ b/zimfw.zsh @@ -33,7 +33,7 @@ fi : ${ZIM_HOME=${0:A:h}} _zimfw_compile() { - setopt LOCAL_OPTIONS EXTENDED_GLOB + setopt LOCAL_OPTIONS CASE_GLOB EXTENDED_GLOB autoload -U zrecompile local zdumpfile zdir zfile @@ -122,7 +122,7 @@ Startup options: _zfailed=1 return 1 fi - setopt LOCAL_OPTIONS EXTENDED_GLOB + setopt LOCAL_OPTIONS CASE_GLOB EXTENDED_GLOB local zmodule=${1:t} zurl=${1} local ztype=branch zrev=master local -i zdisabled=0 zfrozen=0 @@ -265,7 +265,7 @@ _zimfw_clean_dumpfile() { } _zimfw_info() { - print 'Zim version: 1.0.0-SNAPSHOT (previous commit is bd8ae83)' + print 'Zim version: 1.0.0-SNAPSHOT (previous commit is 4a7ce44)' print -R 'ZIM_HOME: '${ZIM_HOME} print -R 'Zsh version: '${ZSH_VERSION} print -R 'System info: '$(command uname -a)