Merge commit '0717e57ff46201ff04e7d62cda8677e174a83be6'

This commit is contained in:
Roman Perepelitsa
2020-06-14 10:29:29 +02:00
4 changed files with 15 additions and 13 deletions
+1 -1
View File
@@ -131,7 +131,7 @@ END
>&2 echo "[gitstatus] error: GITSTATUS_DAEMON is not absolute path: $daemon"
return 1
fi
if [ -z "$daemon" && -e "$gitstatus_dir"/usrbin/gitstatusd ]; then
if [ -z "$daemon" -a -e "$gitstatus_dir"/usrbin/gitstatusd ]; then
daemon="$gitstatus_dir"/usrbin/gitstatusd
fi
if [ -n "$daemon" ]; then