diff options
| author | Roman Perepelitsa <roman.perepelitsa@gmail.com> | 2020-06-13 12:15:44 +0300 |
|---|---|---|
| committer | Roman Perepelitsa <roman.perepelitsa@gmail.com> | 2020-06-13 12:15:44 +0300 |
| commit | b0158178925484c058e6175e174b639237532c63 (patch) | |
| tree | f981d2d715e6ef7de67c2dab6f3195fd7fa46341 /install | |
| parent | fa2e337cbdd88ccd297d25fa9847225211801d3e (diff) | |
Squashed 'gitstatus/' changes from 38d62a47..1c74c8db
1c74c8db add linux-ppc64le
968779b5 fix tar invocation
300f657c create anonymous tar archives
a5581d18 force C locale during build (perl complains)
2616cd47 support downloads to usrbin
1e6075dd enable static linking on linux
2975d25f update libgit2 ref
bea6f868 add ppc64le target
git-subtree-dir: gitstatus
git-subtree-split: 1c74c8db0f422aa6f95ced878351e0c6944a9bd6
Diffstat (limited to 'install')
| -rwxr-xr-x | install | 30 |
1 files changed, 7 insertions, 23 deletions
@@ -131,14 +131,8 @@ END >&2 echo "[gitstatus] error: GITSTATUS_DAEMON is not absolute path: $daemon" return 1 fi - if [ -z "$daemon" ]; then + if [ -z "$daemon" && -e "$gitstatus_dir"/usrbin/gitstatusd ]; then daemon="$gitstatus_dir"/usrbin/gitstatusd - if [ ! -e "$daemon" ]; then - daemon="$daemon"-"$uname_s"-"$uname_m" - if [ ! -e "$daemon" ]; then - daemon= - fi - fi fi if [ -n "$daemon" ]; then local gitstatus_version= libgit2_version= @@ -184,23 +178,13 @@ END if [ -z "$no_check" ]; then # Check if a suitable gitstatusd already exists. - local daemon="$cache_dir"/"$file" - if [ -e "$daemon" ]; then - [ $# = 0 ] || "$@" "$daemon" "$version" 0 - return + local daemon="$gitstatus_dir"/usrbin/"$file" + if [ ! -e "$daemon" ]; then + daemon="$cache_dir"/"$file" + [ -e "$daemon" ] || daemon= fi - daemon="$daemon"-"$uname_s"-"$uname_m" - if [ -e "$daemon" ]; then - local gitstatus_version= libgit2_version= - if ! . "$gitstatus_dir"/build.info; then - >&2 echo "[gitstatus] internal error: failed to source build.info" - return 1 - fi - if [ -z "$gitstatus_version" ]; then - >&2 echo "[gitstatus] internal error: empty gitstatus_version in build.info" - return 1 - fi - [ $# = 0 ] || "$@" "$daemon" "$gitstatus_version" 0 + if [ -n "$daemon" ]; then + [ $# = 0 ] || "$@" "$daemon" "$version" 0 return fi fi |