GPU: [Linux + AMD] Remove some OEM stuff from the info

CHANGELOG.md

@@ -1,100 +1,20 @@
-This release of Neofetch fixes some important bugs that were found after 2.0 was release. This includes: Detection issues on CentOS and Linux Mint systems, Incorrect Memory usage on BSD, Linux GPU detection issues and more.
+This minor release fixes some issues related to new features added in 2.0. These issues weren't picked up in the time between 2.0 and 2.1 and another minor release is needed due to the Packages issue being rather important.
 
-This release also includes a rewrite of the screenshot functions. You no longer have to set the program to use in your config. Neofetch now automatically finds and uses whatever screenshot tool is available on your machine.
+These issues were fixed by reverting the GPU caching and Packages optimizations. These issues occurred because not enough testing was done before these were implemented in master. In the future I'll take more care with testing these larger changes before they hit the master branch and I apologize for there being yet another release in one week.
 
-[See the screenshot section below for more info.](#screenshots)
+I also want to apologize to those packaging Neofetch for this unexpected release.
-
-The `get_packages()` function was optimized. Neofetch's packages function works by detecting which package managers are installed on your system and then using a sum of those as the packages output.
-
-Previously the function would call `wc -l` for every package manager, instead we now call `wc -l` only once at the end of the function.
-
-Thanks for reporting these bugs and also suggesting these features. Don't be shy, report any bugs, annoyances or etc with Neofetch and I'll happily help you out.
-
-Thanks to **[@konimex](https://github.com/konimex)** for all of his contributions this release. :)
-
-
-## Contributors
-
-- **[@konimex](https://github.com/konimex)**
-
-
-## General
-
-- Use `$kernel_name` instead of `$distro` in some functions. **[@konimex](https://github.com/konimex)**
 
 
 ## Info
 
-**Distro**<br \>
+**Packages**<br \>
 
-- Added support for Apricity OS.
+- Fixed issue where package output was off by one.
-- Added support for GoboLinux. **[@konimex](https://github.com/konimex)**
-- Added support for SwagArch.
-- Added support for AOSC OS.
-- Added support for Parrot Security.
-- Fixed bug that caused Linux Mint systems to be identified as Ubuntu.
-- Fixed bug that caused CentOS systems to not be detected.
-
-**Memory**<br \>
-
-- [BSD] Fixed high memory output.
 
 **GPU**<br \>
 
-- [Linux] Fixed bug where sound card was detected as GPU.
+- Fixed bug with `--gpu_brand` not working.
 
-**Packages**<br \>
+**Theme**<br \>
 
-- Only call `wc -l` once at the end of the function instead of calling it once per package manager.
+- [Cinnamon] Fixed incorrect information.
-
-**Desktop Environment**<br \>
-
-- Show Cinnamon version.
-
-
-## Image
-
-- Changed default image mode to `ascii`.
-    - See: [Images in the terminal](https://github.com/dylanaraps/neofetch/wiki/Images-in-the-terminal#enabling-image-mode)
-
-
-## Wallpaper
-
-- Rewrote wallpaper function.
-- Prioritize DE wallpaper setters before falling back to `feh`/`nitrogen`.
-- Added support for XFCE's wallpaper setter.
-- Added support for Solaris and GNU Hurd. **[@konimex](https://github.com/konimex)**
-
-
-## Ascii
-
-![ubuntu](https://u.teknik.io/zILeY.png)
-<br \><sub>Old Ubuntu Logo vs New Ubuntu Logo</sub>
-
-- Updated Ubuntu logo to the latest version.
-    - You can use the old logo by launching neofetch with `--ascii_distro ubuntu_old` or by changing `$ascii_distro` to `ubuntu_old` in your config file.
-- `--ascii_colors` no longer changes text colors.
-- Added ascii art for Ubuntu-Budgie.
-    - You can use the ascii art by launching Neofetch with `--ascii_distro ubuntu-budgie` or by changing `$ascii_distro` to `ubuntu-budgie` in your config file.
-- Fixed bug causing RFRemix to use the incorrect ascii art.
-
-
-## Screenshots
-
-Neofetch will now automatically find and use whatever screenshot tool is available on your system. The screenshot tool is no longer hardcoded and you don't have to edit your config file to specify what program to use.
-
-On Haiku and macOS, Neofetch will use the built-in tools to take screenshots. On systems with an X server Neofetch will look for and use the following programs: `scrot`, `maim`, `import (imagemagick)`, `imlib2_grab` and `gnome-screenshot`.
-
-The config option `scrot_cmd` and the commandline flag `--scrot_cmd` are still there for those who want to use custom flags, programs or scripts to take screenshots.
-
-- Automatically use whatever screenshot tool is available.
-- Added screenshot support to macOS
-- Added screenshot support to Haiku
-
-
-## Screenshot Upload
-
-- [teknik.io] Fixed images not uploading with the right filetype.
-- Changed default image upload host to `teknik.io`.
-    - teknik doesn't compress images whereas imgur does.
-    - You can change this back to imgur by using `--image_host imgur` or by editing your config file.

neofetch

@@ -382,75 +382,66 @@ get_packages() {
     case "$os" in
         "Linux" | "iPhone OS" | "Solaris" | "GNU")
             type -p pacman >/dev/null && \
-                packages=("$(pacman -Qq --color never)")
+                packages="$(pacman -Qq --color never | wc -l)"
 
             type -p dpkg >/dev/null && \
-                packages+=("$(dpkg --get-selections | grep -v deinstall$)")
+                packages="$((packages+=$(dpkg --get-selections | grep -cv deinstall$)))"
 
             type -p /sbin/pkgtool >/dev/null && \
-                packages+=("$(ls -1 /var/log/packages)")
+                packages="$((packages+=$(ls -1 /var/log/packages | wc -l)))"
 
             type -p rpm >/dev/null && \
-                packages+=("$(rpm -qa)")
+                packages="$((packages+=$(rpm -qa | wc -l)))"
 
             type -p xbps-query >/dev/null && \
-                packages+=("$(xbps-query -l)")
+                packages="$((packages+=$(xbps-query -l | wc -l)))"
 
             type -p pkginfo >/dev/null && \
-                packages+=("$(pkginfo -i)")
+                packages="$((packages+=$(pkginfo -i | wc -l)))"
 
             type -p emerge >/dev/null && \
-                packages+=("$(ls -d /var/db/pkg/*/*)")
+                packages="$((packages+=$(ls -d /var/db/pkg/*/* | wc -l)))"
 
             type -p nix-env >/dev/null && \
-                packages+=("$(ls -d -1 /nix/store/*/)")
+                packages="$((packages+=$(ls -d -1 /nix/store/*/ | wc -l)))"
 
             type -p guix >/dev/null && \
-                packages+=("$(ls -d -1 /gnu/store/*/)")
+                packages="$((packages+=$(ls -d -1 /gnu/store/*/ | wc -l)))"
 
             type -p apk >/dev/null && \
-                packages+=("$(apk info)")
+                packages="$((packages+=$(apk info | wc -l)))"
 
             type -p opkg >/dev/null && \
-                packages+=("$(opkg list-installed)")
+                packages="$((packages+=$(opkg list-installed | wc -l)))"
 
             type -p pacman-g2 >/dev/null && \
-                packages+=("$(pacman-g2 -Q)")
+                packages="$((packages+=$(pacman-g2 -Q | wc -l)))"
 
             type -p cave >/dev/null && \
-                packages+=("$(ls -d -1 /var/db/paludis/repositories/cross-installed/*/data/* /var/db/paludis/repositories/installed/data/*)")
+                packages="$((packages+=$(ls -d -1 /var/db/paludis/repositories/cross-installed/*/data/* /var/db/paludis/repositories/installed/data/* | wc -l)))"
 
             type -p lvu >/dev/null && \
-                packages+=("$(lvu installed)")
+                packages="$((packages+=$(lvu installed | wc -l)))"
 
             type -p tce-status >/dev/null && \
-                packages+=("$(tce-status -i)")
+                packages="$((packages+=$(tce-status -i | wc -l)))"
 
             type -p Compile >/dev/null && \
-                packages+=("$(ls -d -1 /Programs/*/)")
+                packages="$((packages+=$(ls -d -1 /Programs/*/ | wc -l)))"
 
             # pisi is sometimes unavailable in Solus(?). This uses eopkg
             # instead if pisi isn't found.
             if type -p pisi >/dev/null; then
-                packages+=("$(pisi list-installed)")
+                packages="$((packages+=$(pisi list-installed | wc -l)))"
 
             elif type -p eopkg >/dev/null; then
-                packages+=("$(eopkg list-installed)")
+                packages="$((packages+=$(eopkg list-installed | wc -l)))"
             fi
 
             if type -p pkg >/dev/null; then
-                packages+=("$(ls -1 /var/db/pkg)")
+                packages="$((packages+=$(ls -1 /var/db/pkg | wc -l)))"
-                (("$packages" == "0")) && packages+=("$(pkg list)")
+                (("$packages" == "0")) && packages="$((packages+=$(pkg list | wc -l)))"
             fi
-
-            # Count the packages.
-            packages="$(wc -l <<< "${packages[@]}")"
-
-            # Due to the sum of wc -l being off by 1 per package manager
-            # we add the number of package managers to make up for it.
-            # We then remove 2 since the first and last package manager
-            # arent't affected by the off by 1 counting error.
-            packages="$((packages + ${#packages[@]} - 2))"
         ;;
 
         "Mac OS X")
@@ -955,6 +946,8 @@ get_gpu() {
                     gpu="${gpu//Intel*$'\n'}"
                     gpu="${gpu/'[AMD/ATI]' }"
                     gpu="${gpu/'[AMD]' }"
+                    gpu="${gpu/OEM }"
+                    gpu="${gpu/ \/ *}"
                     gpu="${gpu/*\[}"
                     gpu="${gpu/\]*}"
                     gpu="AMD $gpu"
@@ -980,6 +973,7 @@ get_gpu() {
             gpu="$(system_profiler SPDisplaysDataType | awk -F': ' '/^\ *Chipset Model:/ {printf $2 ", "}')"
             gpu="${gpu//'/ $'}"
             gpu="${gpu%,*}"
+            cache "gpu" "$gpu"
         ;;
 
         "iPhone OS")
@@ -1044,8 +1038,6 @@ get_gpu() {
         gpu="${gpu/NVIDIA}"
         gpu="${gpu/Intel}"
     fi
-
-    cache "gpu" "$gpu"
 }
 
 get_memory() {
@@ -1363,7 +1355,7 @@ get_style() {
                 fi
             ;;
 
-            *"Cinnamon")
+            *"Cinnamon"*)
                 if type -p gsettings >/dev/null; then
                     gtk3_theme="$(gsettings get org.cinnamon.desktop.interface "$gsettings")"
                     gtk2_theme="$gtk3_theme"
@@ -3311,7 +3303,7 @@ get_args() {
             "-v") verbose="on" ;;
             "-vv") set -x; verbose="on" ;;
             "--help") usage ;;
-            "--version") printf "%s\n" "Neofetch 2.0.1"; exit ;;
+            "--version") printf "%s\n" "Neofetch 2.0.2"; exit ;;
         esac
 
         shift

neofetch.1

@@ -1,4 +1,4 @@
-.TH NEOFETCH "1" "December 2016" "2.0.1" "User Commands"
+.TH NEOFETCH "1" "December 2016" "2.0.2" "User Commands"
 .SH NAME
 neofetch \- simple system information script