kforney/hyfetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Dylan Araps 2016-11-19 10:31:46 +11:00
commit 98950b4f25
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CHANGELOG.md
View file

@ -3,6 +3,8 @@
- **[@konimex](https://github.com/konimex)** - **[@konimex](https://github.com/konimex)**
- **[@TonCherAmi](https://github.com/TonCherAmi)** - **[@TonCherAmi](https://github.com/TonCherAmi)**
- **[@JorgeGonzalez](https://github.com/JorgeGonzalez)** - **[@JorgeGonzalez](https://github.com/JorgeGonzalez)**
- **[@iandrewt](https://github.com/iandrewt)**
- **[@iwamatsu](https://github.com/iwamatsu)**
## General ## General
@ -44,6 +46,7 @@
- Rename `colors()` to `get_distro_colors()`. - Rename `colors()` to `get_distro_colors()`.
- Rename `setcolors()` to `set_colors()`. - Rename `setcolors()` to `set_colors()`.
- Remove all duplicates from `get_distro_colors()`. - Remove all duplicates from `get_distro_colors()`.
- Remove execution permission flag from ascii art files. **[@iwamatsu](https://github.com/iwamatsu)**
- Update Netrunner ascii art. - Update Netrunner ascii art.
@ -72,6 +75,8 @@
**Packages**<br \> **Packages**<br \>
- [Solus] If `pisi` is unavailable, use `eopkg`. - [Solus] If `pisi` is unavailable, use `eopkg`.
- Added package detection for Lunar Linux. **[@konimex](https://github.com/konimex)**
- Added package detection for TinyCore. **[@konimex](https://github.com/konimex)**
**GPU**<br \> **GPU**<br \>
@ -97,3 +102,7 @@
- Added support for GNOME Music. **[@konimex](https://github.com/konimex)** - Added support for GNOME Music. **[@konimex](https://github.com/konimex)**
- Added support for Lollypop. **[@konimex](https://github.com/konimex)** - Added support for Lollypop. **[@konimex](https://github.com/konimex)**
**Public IP**<br \>
- [dig] Fixed connection timed out with public_ip. **[@iandrewt](https://github.com/iandrewt)**

2
Makefile
View file

@ -14,7 +14,7 @@ install:
$(INSTALL_PROG) neofetch $(DESTDIR)$(PREFIX)/bin/neofetch $(INSTALL_PROG) neofetch $(DESTDIR)$(PREFIX)/bin/neofetch
$(INSTALL_FILE) neofetch.1 $(DESTDIR)$(PREFIX)/share/man/man1/neofetch.1 $(INSTALL_FILE) neofetch.1 $(DESTDIR)$(PREFIX)/share/man/man1/neofetch.1
$(INSTALL_PROG) config/config $(DESTDIR)$(PREFIX)/share/neofetch/config $(INSTALL_PROG) config/config $(DESTDIR)$(PREFIX)/share/neofetch/config
$(INSTALL_PROG) ascii/distro/* $(DESTDIR)$(PREFIX)/share/neofetch/ascii/distro $(INSTALL_FILE) ascii/distro/* $(DESTDIR)$(PREFIX)/share/neofetch/ascii/distro
uninstall: uninstall:
$(RM) $(DESTDIR)$(PREFIX)/bin/neofetch $(RM) $(DESTDIR)$(PREFIX)/bin/neofetch

7
neofetch
View file

@ -412,6 +412,12 @@ get_packages() {
packages="$((packages+=$(ls -1 /var/db/pkg | wc -l)))" packages="$((packages+=$(ls -1 /var/db/pkg | wc -l)))"
(("$packages" == "0")) && packages="$((packages+=$(pkg list | wc -l)))" (("$packages" == "0")) && packages="$((packages+=$(pkg list | wc -l)))"
fi fi
type -p lvu >/dev/null && \
packages="$((packages+=$(lvu installed | wc -l)))"
type -p tce-status >/dev/null && \
packages="$((packages+=$(tce-status -i | wc -l)))"
;; ;;
"Mac OS X") "Mac OS X")
@ -1700,6 +1706,7 @@ get_local_ip() {
get_public_ip() { get_public_ip() {
if type -p dig >/dev/null; then if type -p dig >/dev/null; then
public_ip="$(dig +time=1 +tries=1 +short myip.opendns.com @resolver1.opendns.com)" public_ip="$(dig +time=1 +tries=1 +short myip.opendns.com @resolver1.opendns.com)"
[[ "$public_ip" =~ ^\; ]] && unset public_ip
fi fi
if [[ -z "$public_ip" ]] && type -p curl >/dev/null; then if [[ -z "$public_ip" ]] && type -p curl >/dev/null; then