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

CHANGELOG.md

@@ -3,6 +3,8 @@
 - **[@konimex](https://github.com/konimex)**
 - **[@TonCherAmi](https://github.com/TonCherAmi)**
 - **[@JorgeGonzalez](https://github.com/JorgeGonzalez)**
+- **[@iandrewt](https://github.com/iandrewt)**
+- **[@iwamatsu](https://github.com/iwamatsu)**
 
 
 ## General
@@ -44,6 +46,7 @@
 - Rename `colors()` to `get_distro_colors()`.
 - Rename `setcolors()` to `set_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.
 
 
@@ -72,6 +75,8 @@
 **Packages**<br \>
 
 - [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 \>
 
@@ -97,3 +102,7 @@
 
 - Added support for GNOME Music. **[@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)**

Makefile

@@ -14,7 +14,7 @@ install:
 	$(INSTALL_PROG) neofetch $(DESTDIR)$(PREFIX)/bin/neofetch
 	$(INSTALL_FILE) neofetch.1 $(DESTDIR)$(PREFIX)/share/man/man1/neofetch.1
 	$(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:
 	$(RM) $(DESTDIR)$(PREFIX)/bin/neofetch

neofetch

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