xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle spawning iTerm and screen commands with arguments containing newlines

Browse Source 
Before, sed would add quotes to every line of the single multiline argument,
causing the final quoted argument to "split ... command" or screen to contain
unquoted newlines such as this (from kakoune-cr):

	tell application "iTerm"
	    tell current session of current window
	        tell (split vertically with same profile command "env PATH='...' 'sh' '-c' ''
	'    export KAKOUNE_SESSION=$1'
	'    export KAKOUNE_CLIENT=$2'
	'    shift 3'
	''
	'    [ $# = 0 ] && set \"$SHELL\"'
	''
	'    \"sh\"'
	'  ' '--' '51909' 'client0' 'terminal' ") to select
	    end tell
	end tell

Instead of using sed to do this which operates on single lines at a time, simply
use printf to insert ' quotes before and after the entire argument.
This commit is contained in:
Marco Rebhan 2022-11-20 02:13:34 +01:00
parent df12bc8dbd
commit c57805a926
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rc/windowing/iterm.kak
View File

@ -15,11 +15,7 @@ define-command -hidden -params 2.. iterm-terminal-split-impl %{
# join the arguments as one string for the shell execution (see x11.kak) # join the arguments as one string for the shell execution (see x11.kak)
args=$( args=$(
for i in "$@"; do for i in "$@"; do
if [ "$i" = '' ]; then printf "'%s' " "$(printf %s "$i" | sed "s|'|'\\\\''|g")"
printf "'' "
else
printf %s "$i" | sed -e "s|'|'\\\\''|g; s|^|'|; s|$|' |"
fi
done done
) )
@ -69,11 +65,7 @@ The program passed as argument will be executed in the new terminal'\
# see above # see above
args=$( args=$(
for i in "$@"; do for i in "$@"; do
if [ "$i" = '' ]; then printf "'%s' " "$(printf %s "$i" | sed "s|'|'\\\\''|g")"
printf "'' "
else
printf %s "$i" | sed -e "s|'|'\\\\''|g; s|^|'|; s|$|' |"
fi
done done
) )
escaped=$(printf %s "$args" | sed -e 's|\\|\\\\|g; s|"|\\"|g') escaped=$(printf %s "$args" | sed -e 's|\\|\\\\|g; s|"|\\"|g')
@ -96,11 +88,7 @@ The program passed as argument will be executed in the new terminal'\
# see above # see above
args=$( args=$(
for i in "$@"; do for i in "$@"; do
if [ "$i" = '' ]; then printf "'%s' " "$(printf %s "$i" | sed "s|'|'\\\\''|g")"
printf "'' "
else
printf %s "$i" | sed -e "s|'|'\\\\''|g; s|^|'|; s|$|' |"
fi
done done
) )
escaped=$(printf %s "$args" | sed -e 's|\\|\\\\|g; s|"|\\"|g') escaped=$(printf %s "$args" | sed -e 's|\\|\\\\|g; s|"|\\"|g')

6
rc/windowing/screen.kak
View File

@ -17,11 +17,7 @@ define-command screen-terminal-impl -hidden -params 3.. %{
# see x11.kak for what this achieves # see x11.kak for what this achieves
args=$( args=$(
for i in "$@"; do for i in "$@"; do
if [ "$i" = '' ]; then printf "'%s' " "$(printf %s "$i" | sed "s|'|'\\\\''|g")"
printf "'' "
else
printf %s "$i" | sed -e "s|'|'\\\\''|g; s|^|'|; s|$|' |"
fi
done done
) )
screen -X screen sh -c "${args} ; screen -X remove" < "/dev/$tty" screen -X screen sh -c "${args} ; screen -X remove" < "/dev/$tty"