From 31c420e0685003c12b47306d85c266ee3fa05230 Mon Sep 17 00:00:00 2001 From: Atsushi KAWASAKI Date: Fri, 28 Oct 2022 15:56:39 +0900 Subject: [PATCH] add support for variable expansion in config files If tmux.conf refers other file by source-file command that uses variable, it'll be better to expand variables into actual values. Both single and double quotation marks are must be recognized correctly. --- scripts/helpers/plugin_functions.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/helpers/plugin_functions.sh b/scripts/helpers/plugin_functions.sh index f33d215..1fe2c86 100644 --- a/scripts/helpers/plugin_functions.sh +++ b/scripts/helpers/plugin_functions.sh @@ -46,7 +46,8 @@ _tmux_conf_contents() { # return files sourced from tmux config files _sourced_files() { _tmux_conf_contents | - sed -E -n -e "s/^[[:space:]]*source(-file)?[[:space:]]+(-q+[[:space:]]+)?['\"]?([^'\"]+)['\"]?/\3/p" + sed -E -n -e "s/^[[:space:]]*source(-file)?[[:space:]]+(-q+[[:space:]]+)?(['\"]?[^'\"]+['\"]?)/echo \3/p" | + /usr/bin/env bash } # Want to be able to abort in certain cases