From 83289bb94d60730e59ad5e5aa94d13fdea8aa96e Mon Sep 17 00:00:00 2001 From: Chris Down Date: Fri, 27 Apr 2018 02:13:06 +0100 Subject: [PATCH 1/2] test-perf: Now that we check CM_LAUNCHER, change from aliases to functions --- tests/test-perf | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/test-perf b/tests/test-perf index cde9e3a..3c51544 100755 --- 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 From 44545be18e82311dfcc37c65dfc8935a689246f7 Mon Sep 17 00:00:00 2001 From: Chris Down Date: Wed, 9 May 2018 13:02:54 +0100 Subject: [PATCH 2/2] Canonicalise missing elements in readlink Fixes #81. --- clipmenud | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clipmenud b/clipmenud index 4eba9ac..6d481ed 100755 --- 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