From 0717e57ff46201ff04e7d62cda8677e174a83be6 Mon Sep 17 00:00:00 2001 From: Roman Perepelitsa Date: Sun, 14 Jun 2020 10:29:29 +0200 Subject: Squashed 'gitstatus/' changes from 1c74c8db..0d23fbd1 0d23fbd1 comments 9c19c9c4 fix a typo in install that prevents the locally built gitstatusd from being used 92fd143f doc cleanup git-subtree-dir: gitstatus git-subtree-split: 0d23fbd117ad6afe52fdbd96d08cf38f941be4d3 --- install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'install') diff --git a/install b/install index 4303129b..ec442ed9 100755 --- a/install +++ b/install @@ -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 -- cgit v1.2.3