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

2016-03-26 12:05:03 +11:00 · 2016-03-26 12:05:03 +11:00 · d0e0bfcdad
parent 220f7f5c0d 869d3c0c7c
commit d0e0bfcdad
2 changed files with 2 additions and 1 deletions
--- a/1.6.md
+++ b/1.6.md
@ -38,6 +38,7 @@ Thanks to the following people for contributing this release.

 **Song**<br \>
 - [ 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 \>
 - Added new display option `perc` to display just the percentage with the progress bar.
--- a/2
+++ b/2
@ -1285,7 +1285,7 @@ getresolution () {
                esac 
                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}')
            fi
        ;;