summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcodesoap <codesoap@mailbox.org>2019-06-09 11:45:59 +0200
committercodesoap <codesoap@mailbox.org>2019-06-09 11:50:35 +0200
commit009eb80ca0e606babd2d9b735faa7ec7643a046e (patch)
treed455ec8e27bafa7f737bc880489fac8273c39435
parent09e1ec97a9d7925c9d4411f4f274919aeea1bf75 (diff)
Fix tools using fifos for OpenBSD
Without these changes, kak would hang on the corresponding commands, displaying a 'waiting for shell command to finish' message.
-rw-r--r--rc/tools/clang.kak4
-rw-r--r--rc/tools/git.kak2
-rw-r--r--rc/tools/grep.kak4
-rw-r--r--rc/tools/lint.kak4
-rw-r--r--rc/tools/make.kak2
-rw-r--r--rc/tools/python/jedi.kak4
6 files changed, 10 insertions, 10 deletions
diff --git a/rc/tools/clang.kak b/rc/tools/clang.kak
index 678181bf..e0f90299 100644
--- a/rc/tools/clang.kak
+++ b/rc/tools/clang.kak
@@ -36,7 +36,7 @@ The syntaxic errors detected during parsing are shown when auto-diagnostics are
# not hang while clang is running. As completions references a cursor
# position and a buffer timestamp, only valid completions should be
# displayed.
- (
+ {(
case ${kak_opt_filetype} in
c) ft=c ;;
cpp) ft=c++ ;;
@@ -100,7 +100,7 @@ The syntaxic errors detected during parsing are shown when auto-diagnostics are
printf %s\\n "set-option 'buffer=${kak_buffile}' clang_flags ${kak_timestamp} ${flags}
set-option 'buffer=${kak_buffile}' clang_errors ${kak_timestamp} ${errors}" | kak -p ${kak_session}
- ) > /dev/null 2>&1 < /dev/null &
+ ) & } > /dev/null 2>&1 < /dev/null
}
}
diff --git a/rc/tools/git.kak b/rc/tools/git.kak
index d99de777..47e3d59a 100644
--- a/rc/tools/git.kak
+++ b/rc/tools/git.kak
@@ -45,7 +45,7 @@ Available commands:\n add\n rm\n blame\n commit\n checkout\n diff\n hide-
esac
output=$(mktemp -d "${TMPDIR:-/tmp}"/kak-git.XXXXXXXX)/fifo
mkfifo ${output}
- ( git "$@" > ${output} 2>&1 ) > /dev/null 2>&1 < /dev/null &
+ ( git "$@" > ${output} 2>&1 & ) > /dev/null 2>&1 < /dev/null
printf %s "evaluate-commands -try-client '$kak_opt_docsclient' %{
edit! -fifo ${output} *git*
diff --git a/rc/tools/grep.kak b/rc/tools/grep.kak
index 9e6ed5ab..33d5be38 100644
--- a/rc/tools/grep.kak
+++ b/rc/tools/grep.kak
@@ -11,9 +11,9 @@ All the optional arguments are forwarded to the grep utility} \
output=$(mktemp -d "${TMPDIR:-/tmp}"/kak-grep.XXXXXXXX)/fifo
mkfifo ${output}
if [ $# -gt 0 ]; then
- ( ${kak_opt_grepcmd} "$@" | tr -d '\r' > ${output} 2>&1 ) > /dev/null 2>&1 < /dev/null &
+ ( ${kak_opt_grepcmd} "$@" | tr -d '\r' > ${output} 2>&1 & ) > /dev/null 2>&1 < /dev/null
else
- ( ${kak_opt_grepcmd} "${kak_selection}" | tr -d '\r' > ${output} 2>&1 ) > /dev/null 2>&1 < /dev/null &
+ ( ${kak_opt_grepcmd} "${kak_selection}" | tr -d '\r' > ${output} 2>&1 & ) > /dev/null 2>&1 < /dev/null
fi
printf %s\\n "evaluate-commands -try-client '$kak_opt_toolsclient' %{
diff --git a/rc/tools/lint.kak b/rc/tools/lint.kak
index de120df2..d39e7d32 100644
--- a/rc/tools/lint.kak
+++ b/rc/tools/lint.kak
@@ -28,7 +28,7 @@ define-command lint -docstring 'Parse the current buffer with a linter' %{
hook -always -once buffer BufCloseFifo .* %{ nop %sh{ rm -r '$dir' } }
}"
- { # do the parsing in the background and when ready send to the session
+ {{ # do the parsing in the background and when ready send to the session
eval "$kak_opt_lintcmd '$dir'/${filename}" | sort -t: -k2,2 -n > "$dir"/stderr
@@ -78,7 +78,7 @@ define-command lint -docstring 'Parse the current buffer with a linter' %{
}
' > "$dir"/fifo
- } >/dev/null 2>&1 </dev/null &
+ } & } >/dev/null 2>&1 </dev/null
}
}
diff --git a/rc/tools/make.kak b/rc/tools/make.kak
index 89533a59..fabd7e75 100644
--- a/rc/tools/make.kak
+++ b/rc/tools/make.kak
@@ -13,7 +13,7 @@ All the optional arguments are forwarded to the make utility} \
make %{ evaluate-commands %sh{
output=$(mktemp -d "${TMPDIR:-/tmp}"/kak-make.XXXXXXXX)/fifo
mkfifo ${output}
- ( eval ${kak_opt_makecmd} "$@" > ${output} 2>&1 ) > /dev/null 2>&1 < /dev/null &
+ ( eval ${kak_opt_makecmd} "$@" > ${output} 2>&1 & ) > /dev/null 2>&1 < /dev/null
printf %s\\n "evaluate-commands -try-client '$kak_opt_toolsclient' %{
edit! -fifo ${output} -scroll *make*
diff --git a/rc/tools/python/jedi.kak b/rc/tools/python/jedi.kak
index 5f28ba64..05b41598 100644
--- a/rc/tools/python/jedi.kak
+++ b/rc/tools/python/jedi.kak
@@ -19,7 +19,7 @@ define-command jedi-complete -docstring "Complete the current selection" %{
evaluate-commands %sh{
dir=${kak_opt_jedi_tmp_dir}
printf %s\\n "evaluate-commands -draft %{ edit! -fifo ${dir}/fifo *jedi-output* }"
- (
+ {(
cd $(dirname ${kak_buffile})
header="${kak_cursor_line}.${kak_cursor_column}@${kak_timestamp}"
@@ -32,7 +32,7 @@ define-command jedi-complete -docstring "Complete the current selection" %{
)
printf %s\\n "evaluate-commands -client ${kak_client} %~echo completed; set-option %{buffer=${kak_buffile}} jedi_completions ${header} ${compl}~" | kak -p ${kak_session}
rm -r ${dir}
- ) > /dev/null 2>&1 < /dev/null &
+ ) & } > /dev/null 2>&1 < /dev/null
}
}