Merge branch 'master' of github.com:dylanaraps/neofetch

This commit is contained in:
Dylan 2016-03-26 12:05:03 +11:00
commit d0e0bfcdad
2 changed files with 2 additions and 1 deletions

1
1.6.md
View file

@ -38,6 +38,7 @@ Thanks to the following people for contributing this release.
**Song**<br \> **Song**<br \>
- [ MPD ] Fixed function when mpd is running on another PC and not your own. - [ MPD ] Fixed function when mpd is running on another PC and not your own.
- Added support for Google Play Music Desktop Player (adds optional dependency of [`gpmdp-bash`](https://github.com/iandrewt/gpmdp-bash)) **[@iandrewt](https://github.com/iandrewt)**
**Disk**<br \> **Disk**<br \>
- Added new display option `perc` to display just the percentage with the progress bar. - Added new display option `perc` to display just the percentage with the progress bar.

View file

@ -1285,7 +1285,7 @@ getresolution () {
esac esac
resolution=${resolution//\*} resolution=${resolution//\*}
elif type -p xdpyinfo >/dev/null 2>&1 && \ elif type -p xdpyinfo >/dev/null 2>&1; then
resolution=$(xdpyinfo 2>/dev/null | awk '/dimensions:/ {printf $2}') resolution=$(xdpyinfo 2>/dev/null | awk '/dimensions:/ {printf $2}')
fi fi
;; ;;