aboutsummaryrefslogtreecommitdiff
path: root/install
diff options
context:
space:
mode:
authorRoman Perepelitsa <roman.perepelitsa@gmail.com>2020-06-14 11:29:29 +0300
committerRoman Perepelitsa <roman.perepelitsa@gmail.com>2020-06-14 11:29:29 +0300
commit0717e57ff46201ff04e7d62cda8677e174a83be6 (patch)
treea965388ce18d5a10a3d77d8755aac97e96f0d1da /install
parentb0158178925484c058e6175e174b639237532c63 (diff)
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
Diffstat (limited to 'install')
-rwxr-xr-xinstall2
1 files changed, 1 insertions, 1 deletions
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