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

This commit is contained in:
Dylan 2016-05-15 01:00:35 +10:00
commit 134146399a
2 changed files with 4 additions and 3 deletions

View File

@ -80,7 +80,7 @@ Have a look at the wiki, I've updated/added some new pages!<br \>
- `Bash 3.0+`
- Alpine Linux: You also need `ncurses`.
- `xprop` \[1\]
##### Windows (CYGWIN)
@ -101,6 +101,7 @@ These dependencies can all be installed through Cydia.
### Optional dependencies:
- Desktop Environment and Window Manager: `xprop` \[1\]
- Displaying images: `w3m-img` \[2\] \[3\] or `iTerm2` \[4\]
- Thumbnail creation: `imagemagick`
- Displaying song information from Google Play Music Desktop Player: [`gpmdp`](https://github.com/iAndrewT/gpmdp-bash)

View File

@ -7,10 +7,9 @@
#
# Required Dependencies:
# Bash 3.0+
# xprop
# [Linux / BSD / Windows] Uptime detection: procps or procps-ng
#
# Optional Dependencies: (You'll lose these features without them)
# Desktop Environment and Window Manager: xprop
# Displaying Images: w3m + w3m-img
# Image Cropping: ImageMagick
# Displaying song with Google Play Music: gpmdp-bash
@ -19,6 +18,7 @@
# [ Linux ] Current Song: spotify
# [ Linux / BSD ] Resolution detection: xorg-xdpyinfo
# [ OS X ] Getting screen resolution (faster): screenresolution
# [Windows] Uptime detection: procps or procps-ng
#
# Created by Dylan Araps
# https://github.com/dylanaraps/