Merge branch 'release/5.3.1'
This commit is contained in:
commit
f3badd8f35
|
@ -27,7 +27,7 @@ for file in /proc/self/fd/2 /dev/stderr; do
|
||||||
[[ -f "$file" ]] || continue
|
[[ -f "$file" ]] || continue
|
||||||
# In Linux, it's not possible to write to a socket represented by a file
|
# 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.
|
# (for example, /dev/stderr or /proc/self/fd/2). See issue #54.
|
||||||
[[ -f "$(readlink "$file")" ]] || continue
|
[[ -f "$(readlink -m "$file")" ]] || continue
|
||||||
xsel_log="$file"
|
xsel_log="$file"
|
||||||
break
|
break
|
||||||
done
|
done
|
||||||
|
|
|
@ -35,10 +35,8 @@ exec 3>&2 2> >(tee "$log" |
|
||||||
date -f - +%s.%N > "$tim")
|
date -f - +%s.%N > "$tim")
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
shopt -s expand_aliases
|
dmenu() { :; }
|
||||||
|
xsel() { :; }
|
||||||
alias dmenu=:
|
|
||||||
alias xsel=:
|
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue