From 6d69a1b189291a7c871c2d70f24b5610b8b0fd0e Mon Sep 17 00:00:00 2001 From: Brian Seymour Date: Thu, 21 Jan 2021 19:38:00 -0600 Subject: [PATCH] revert emacs code, omit newline in args file so languages stop seeing a blank arg --- lxc/execute | 2 +- lxc/executors/emacs | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lxc/execute b/lxc/execute index d7e5b22..824b578 100755 --- a/lxc/execute +++ b/lxc/execute @@ -22,7 +22,7 @@ mkdir -p $basepath/tmp/$epoch chmod 777 $basepath/tmp/$epoch cat $2 > $basepath$filepath echo $3 > $basepath$stdinpath -echo "${@:4}" > $basepath$argpath +echo -n "${@:4}" > $basepath$argpath # process incrementor exec 200>$dir/lockfile diff --git a/lxc/executors/emacs b/lxc/executors/emacs index bf586e4..ab41624 100755 --- a/lxc/executors/emacs +++ b/lxc/executors/emacs @@ -1,8 +1,4 @@ #!/bin/bash cd /tmp/$2 -if [[ -z $(grep '[^[:space:]]' args.args) ]]; then - timeout -s KILL 3 emacs -Q --script code.code < stdin.stdin -else - timeout -s KILL 3 xargs -a args.args -d '\n' emacs -Q --script code.code < stdin.stdin -fi +timeout -s KILL 3 xargs -a args.args -d '\n' emacs -Q --script code.code < stdin.stdin