commit f3badd8f3558fd152cac91d32562717a00b5066c
parent 21cefad6468e4c8fde541bbb5ea568bb842b6fc2
Author: Chris Down <chris@chrisdown.name>
Date: Wed, 9 May 2018 13:05:08 +0100
Merge branch 'release/5.3.1'
Diffstat:
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/clipmenud b/clipmenud
@@ -27,7 +27,7 @@ for file in /proc/self/fd/2 /dev/stderr; do
[[ -f "$file" ]] || continue
# In Linux, it's not possible to write to a socket represented by a file
# (for example, /dev/stderr or /proc/self/fd/2). See issue #54.
- [[ -f "$(readlink "$file")" ]] || continue
+ [[ -f "$(readlink -m "$file")" ]] || continue
xsel_log="$file"
break
done
diff --git a/tests/test-perf b/tests/test-perf
@@ -35,10 +35,8 @@ exec 3>&2 2> >(tee "$log" |
date -f - +%s.%N > "$tim")
set -x
-shopt -s expand_aliases
-
-alias dmenu=:
-alias xsel=:
+dmenu() { :; }
+xsel() { :; }
EOF