From 79562a614e4c9690dd1053d6e36c0e7b06e53d33 Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Mon, 20 Jul 2015 13:14:08 +0100 Subject: [PATCH] Fix colorscheme completion that triggered a shell syntax error When the user colors dir was missing, expr was failing, with the error ending up in the *debug* buffer --- share/kak/kakrc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/share/kak/kakrc b/share/kak/kakrc index e50a97b5..f7edadf5 100644 --- a/share/kak/kakrc +++ b/share/kak/kakrc @@ -11,9 +11,13 @@ def -shell-params -docstring "colorscheme : enable named colorscheme" \ ( localconfdir=${XDG_CONFIG_HOME:-${HOME}/.config}/kak for col in ${kak_runtime}/colors/*.kak ${localconfdir}/colors/*.kak; do - expr $(basename "${col}" .kak) : "^\(${prefix}.*\)$" + candidate=$(basename "${col}" .kak) + case ${candidate} in + \**) ;; + ${prefix}*) echo ${candidate} ;; + esac done - ) | sort -u | grep -v '^$' + ) | sort -u } \ colorscheme %{ %sh{ localconfdir=${XDG_CONFIG_HOME:-${HOME}/.config}/kak