get_ascii: Do not parse file if it's an image file

docs: changelog
Packages: pkginfo is used by CRUX and JanusLinux
2025-12-16 17:07:12 +00:00 · 2018-08-24 11:07:36 +07:00 · 2018-08-16 13:54:21 +07:00 · 2018-08-16 13:54:20 +07:00 · 2018-08-16 13:24:20 +07:00 · 2018-08-16 13:19:41 +07:00
4 changed files with 222 additions and 135 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,19 +7,42 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

 ## [Unreleased]

+**Contributors**
+
+- [**@nero**](https://github.com/nero)
+- [**@alyssais**](https://github.com/alyssais)
+- [**@plgruener**](https://github.com/plgruener)
+
+**Info**
+
+- **Shell**: Fixed output for mksh [**@nero**](https://github.com/nero)
+- **Packages** [macOS]: Added detection of Nix [**@alyssais**](https://github.com/alyssais)
+- **Packages**: Fixed packages from pkginfo (pkgutils) not appearing in CRUX/Janus Linux.
+- **Terminal Font**: Added support for Yakuake [**@plgruener**](https://github.com/plgruener)
+
+**ASCII**
+
+- Fixed a bug where ASCII logo changes the terminal foreground color. [**@plgruener**](https://github.com/plgruener)
+
+## [5.0.0] - 2018-06-18
+
 <img src="https://i.imgur.com/ZQI2EYz.png" alt="logo" height="100px">

+A lot of the script has been rewritten and all lint errors have been resolved. There's probably a few bugs so the version number has been bumped to `5.0`. Expect a minor release in the coming days to fix any bugs that come up. Thanks to everyone who contributed to this release.
+
 **Contributors**

- [**@mstraube**](https://github.com/mstraube)
+- [**@arisinfenix**](https://github.com/arisinfenix)
 - [**@iandrewt**](https://github.com/iandrewt)
 - [**@konimex**](https://github.com/konimex)
+- [**@MindTooth**](https://github.com/MindTooth)

 **Operating System**

- Added support for Condres OS. [**@mstraube**](https://github.com/mstraube)
- Added support for RedCore Linux. [**@mstraube**](https://github.com/mstraube)
- Added support for Regata OS. [**@mstraube**](https://github.com/mstraube)
+- Added support for Condres OS. [**@arisinfenix**](https://github.com/arisinfenix)
+- Added support for RedCore Linux. [**@arisinfenix**](https://github.com/arisinfenix)
+- Added support for Regata OS. [**@arisinfenix**](https://github.com/arisinfenix)
+- Added support for ClearOS. [**@arisinfenix**](https://github.com/arisinfenix)
 - Added support for PureOS.
 - Added support for Kibojoe Linux.
 - Added support for SharkLinux.
@@ -62,34 +85,35 @@ See: https://github.com/dylanaraps/neofetch/issues/1001
 - **cpu**: Remove extra call to `uname`.
 - **cpu**: Simplify core calculation.
 - **disk**: Clean up.
- **font**: Fix iTerm2 checking for 2 extra profiles that don't exist.
-  [**@iandrewt**](https://github.com/iandrewt")
+- **font**: Fix iTerm2 checking for 2 extra profiles that don't exist. [**@iandrewt**](https://github.com/iandrewt")
 - **gpu**: Fixed ATI/AMD branding issue.
 - **gpu**: Removed `glxinfo` usage (*too slow*).
- **packages**: Added support for `flatpak`.
-  [**@konimex**](https://github.com/konimex)
- **packages**: Added support for `snap`.
-  [**@konimex**](https://github.com/konimex)
+- **packages**: Added support for `flatpak`. [**@konimex**](https://github.com/konimex)
+- **packages**: Added support for `snap`. [**@konimex**](https://github.com/konimex)
 - **packages**: Added used package managers to output (`Packages: 900
  (pacman, snap)`).
 - **packages**: Fixed issues with `pacman` 5.1.
+- **packages**: Fixed issues with `dpkg`.
 - **packages**: Removed `find` usage.
 - **packages**: Removed `ls` usage.
 - **packages**: Removed `wc -l` usage.
- **song**: Added support for `gmusicbrowser`.
-  [**@mstraube**](https://github.com/mstraube)
+- **song**: Added support for `gmusicbrowser`. [**@arisinfenix**](https://github.com/arisinfenix)
+- **song**: Added support for `SMPlayer`. [**@arisinfenix**](https://github.com/arisinfenix)
+- **song**: Added support for `Dragon Player`. [**@arisinfenix**](https://github.com/arisinfenix)
 - **song**: Fixed song detection on macOS.
 - **song**: Fixed song output on systems using `C` locale.
+- **song**: Added `mpc_args` to send additional arguments to `mpc`.
 - **term\_font**: Clean up of config file handling.
 - **resolution**: Added support for `xwininfo`.

 ## [4.0.2] - 2018-05-19

+### This fixes default config issues on Android, AIX, HP-UX and possibly others.
+
 - [config] Fixed `/dev/stdin` error.
 - [config] Added `--print_config` to display the default config file.
 - [macOS] Fixed xquartz issue.

-
 ## [4.0.1] - 2018-05-18

 ### Note: This release is only required for those running `bash <3.3`.
@@ -2752,7 +2776,8 @@ Changelog:
 Let me know if you're having issues.


-[Unreleased]: https://github.com/dylanaraps/neofetch/compare/4.0.2...HEAD
+[Unreleased]: https://github.com/dylanaraps/neofetch/compare/5.0.0...HEAD
+[5.0.0]: https://github.com/dylanaraps/neofetch/compare/4.0.2...5.0.0
 [4.0.2]: https://github.com/dylanaraps/neofetch/compare/4.0.1...4.0.2
 [4.0.1]: https://github.com/dylanaraps/neofetch/compare/4.0.0...4.0.1
 [4.0.0]: https://github.com/dylanaraps/neofetch/compare/3.4.0...4.0.0
--- a/README.md
+++ b/README.md
@@ -6,8 +6,8 @@
 <a href="https://travis-ci.org/dylanaraps/neofetch"><img src="https://travis-ci.org/dylanaraps/neofetch.svg?branch=master"></a>
 <a href="./LICENSE.md"><img src="https://img.shields.io/badge/license-MIT-blue.svg"></a>
 <a href="https://github.com/dylanaraps/neofetch/releases"><img src="https://img.shields.io/github/release/dylanaraps/neofetch.svg"></a>
-<a href="https://www.patreon.com/dyla"><img src="https://img.shields.io/badge/donate-patreon-yellow.svg"></a>
-<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=V7QNJNKS3WYVS"><img src="https://img.shields.io/badge/donate-paypal-green.svg"></a>
+<a href="https://repology.org/metapackage/neofetch"><img src="https://repology.org/badge/tiny-repos/neofetch.svg" alt="Packaging status"></a>
+<a href="#donate"><img src="https://img.shields.io/badge/donate-donate-yellow.svg"></a>
 </p>

 <img src="https://i.imgur.com/GFmC5Ad.png" alt="neofetch" align="right" height="240px">
@@ -58,5 +58,5 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows,

 Donations allow me to spend more time working on `neofetch` and my other Open Source projects. If you like `neofetch` and want to give back in some way you can donate at the links below.

-<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=V7QNJNKS3WYVS"><img src="https://img.shields.io/badge/donate-paypal-green.svg"></a> <a href="https://www.patreon.com/dyla"><img src="https://img.shields.io/badge/donate-patreon-yellow.svg"></a>
+<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=V7QNJNKS3WYVS"><img src="https://img.shields.io/badge/donate-paypal-yellow.svg"></a> <a href="https://www.patreon.com/dyla"><img src="https://img.shields.io/badge/donate-patreon-yellow.svg"> </a><a href="https://liberapay.com/2211/"><img src="https://img.shields.io/badge/donate-liberapay-yellow.svg"></a>

--- a/292
+++ b/292
@@ -28,7 +28,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.

-version="4.0.3"
+version="5.0.1"

 bash_version="${BASH_VERSION/.*}"
 sys_locale="${LANG:-C}"
@@ -156,7 +156,7 @@ uptime_shorthand="on"
 # on:   '998 (pacman), 8 (flatpak), 4 (snap)'
 # tiny: '908 (pacman, flatpak, snap)'
 # off:  '908'
-package_managers="tiny"
+package_managers="on"


 # Shell
@@ -201,7 +201,7 @@ speed_type="bios_limit"
 #
 # Default: 'off'
 # Values: 'on', 'off'.
-# Flag:    --speed_shorthand.
+# Flag:    --speed_shorthand
 # NOTE: This flag is not supported in systems with CPU speed less than 1 GHz
 #
 # Example:
@@ -424,6 +424,7 @@ disk_subtitle="mount"
 # cmus
 # deadbeef
 # deepin-music
+# dragon
 # elisa
 # exaile
 # gnome-music
@@ -442,8 +443,8 @@ disk_subtitle="mount"
 # quodlibet
 # rhythmbox
 # sayonara
+# smplayer
 # spotify
-# Spotify
 # tomahawk
 # vlc
 # xmms2d
@@ -474,6 +475,12 @@ song_format="%artist% - %album% - %title%"
 # off: 'Song: The Fratellis - Costello Music - Chelsea Dagger'
 song_shorthand="off"

+# 'mpc' arguments (specify a host, password etc).
+#
+# Default:  ''
+# Example: mpc_args=(-h HOST -P PASSWORD)
+mpc_args=()
+

 # Text Colors

@@ -774,13 +781,13 @@ get_os() {
    # $kernel_name is set in a function called cache_uname and is
    # just the output of "uname -s".
    case "$kernel_name" in
-        "Darwin")   : "$(sw_vers -productName)" ;;
-        "SunOS")    : "Solaris" ;;
-        "Haiku")    : "Haiku" ;;
-        "MINIX")    : "MINIX" ;;
-        "AIX")      : "AIX" ;;
-        "IRIX"*)    : "IRIX" ;;
-        "FreeMiNT") : "FreeMiNT" ;;
+        "Darwin"):   "$darwin_name" ;;
+        "SunOS"):    "Solaris" ;;
+        "Haiku"):    "Haiku" ;;
+        "MINIX"):    "MINIX" ;;
+        "AIX"):      "AIX" ;;
+        "IRIX"*):    "IRIX" ;;
+        "FreeMiNT"): "FreeMiNT" ;;

        "Linux" | "GNU"*)
            : "Linux"
@@ -860,7 +867,7 @@ get_distro() {
            # Chrome OS doesn't conform to the /etc/*-release standard.
            # While the file is a series of variables they can't be sourced
            # by the shell since the values aren't quoted.
-            elif [[ "$(< /etc/lsb-release)" == *CHROMEOS* ]]; then
+            elif [[ -f /etc/lsb-release && "$(< /etc/lsb-release)" == *CHROMEOS* ]]; then
                distro="$(awk -F '=' '/NAME|VERSION/ {printf $2 " "}' /etc/lsb-release)"

            elif [[ -f "/etc/os-release" || \
@@ -922,13 +929,10 @@ get_distro() {
            fi

            distro="$(trim_quotes "$distro")"
-            distro="${distro/'NAME='}"
+            distro="${distro/NAME=}"
        ;;

        "Mac OS X")
-            osx_version="$(sw_vers -productVersion)"
-            osx_build="$(sw_vers -buildVersion)"
-
            case "$osx_version" in
                "10.4"*)  codename="Mac OS X Tiger" ;;
                "10.5"*)  codename="Mac OS X Leopard" ;;
@@ -959,7 +963,7 @@ get_distro() {
        ;;

        "iPhone OS")
-            distro="iOS $(sw_vers -productVersion)"
+            distro="iOS $osx_version"

            # "uname -m" doesn't print architecture on iOS so we force it off.
            os_arch="off"
@@ -1179,7 +1183,7 @@ get_uptime() {

                "Mac OS X" | "iPhone OS" | "BSD" | "FreeMiNT")
                    boot="$(sysctl -n kern.boottime)"
-                    boot="${boot/'{ sec = '}"
+                    boot="${boot/\{ sec = }"
                    boot="${boot/,*}"

                    # Get current date in seconds.
@@ -1257,7 +1261,7 @@ get_packages() {
        "Linux" | "BSD" | "iPhone OS" | "Solaris")
            # Package Manager Programs.
            has "pacman-key" && tot pacman -Qq --color never
-            has "dpkg"       && tot dpkg-query -f '\n' -W
+            has "dpkg"       && tot dpkg-query -f '.\n' -W
            has "rpm"        && tot rpm -qa
            has "xbps-query" && tot xbps-query -l
            has "apk"        && tot apk info
@@ -1270,6 +1274,7 @@ get_packages() {
            has "sorcery"    && tot gaze installed
            has "alps"       && tot alps showinstalled
            has "butch"      && tot butch list
+            has "pkginfo"    && tot pkginfo -i

            # Counting files/dirs.
            has "emerge"     && dir /var/db/pkg/*/*/
@@ -1283,11 +1288,10 @@ get_packages() {
                                    /var/db/paludis/repositories/installed/data/*/

            # Other (Needs complex command)
-            has "kpm-pkg"    && ((packages+="$(kpm  --get-selections | grep -cv deinstall$)"))
+            has "kpm-pkg" && ((packages+="$(kpm  --get-selections | grep -cv deinstall$)"))

            case "$kernel_name" in
-                "FreeBSD") has "pkg"     && tot pkg info ;;
-                "SunOS")   has "pkginfo" && tot pkginfo -i ;;
+                "FreeBSD") has "pkg" && tot pkg info ;;
                *)
                    has "pkg" && dir /var/db/pkg/*

@@ -1301,13 +1305,14 @@ get_packages() {

            # Snap hangs if the command is run without the daemon running.
            # Only run snap if the daemon is also running.
-            has "snap" && ps -e | grep -Fm 1 "snapd" && tot snap list && ((packages-=1))
+            has "snap" && ps -e | grep -qFm 1 "snapd" >/dev/null && tot snap list && ((packages-=1))
        ;;

        "Mac OS X" | "MINIX")
-            has "port"  && tot port installed && ((packages-=1))
-            has "brew"  && dir /usr/local/Cellar/*
-            has "pkgin" && tot pkgin list
+            has "port"    && tot port installed && ((packages-=1))
+            has "brew"    && dir /usr/local/Cellar/*
+            has "pkgin"   && tot pkgin list
+            has "nix-env" && dir /nix/store/*/
        ;;

        "AIX"| "FreeMiNT")
@@ -1362,7 +1367,7 @@ get_shell() {
            "sh" | "ash" | "dash") ;;

            "mksh" | "ksh")
-                shell+="$("$SHELL" -c "printf %s \$KSH_VERSION")"
+                shell+="$("$SHELL" -c "printf %s \"\$KSH_VERSION\"")"
                shell="${shell/ * KSH}"
                shell="${shell/version}"
            ;;
@@ -1414,7 +1419,7 @@ get_de() {
            ((wm_run != 1)) && get_wm

            if [[ "$XDG_CURRENT_DESKTOP" ]]; then
-                de="${XDG_CURRENT_DESKTOP/'X-'}"
+                de="${XDG_CURRENT_DESKTOP/X\-}"
                de="${de/Budgie:GNOME/Budgie}"
                de="${de/:Unity7:ubuntu}"

@@ -1440,7 +1445,7 @@ get_de() {
    esac

    # Fallback to using xprop.
-    [[ "$DISPLAY" && -z "$de" ]] && \
+    [[ "$DISPLAY" && -z "$de" ]] && type -p xprop &>/dev/null && \
        de="$(xprop -root | awk '/KDE_SESSION_VERSION|^_MUFFIN|xfce4|xfce5/')"

    # Format strings.
@@ -1498,12 +1503,14 @@ get_wm() {
                           -e "weston")"

    elif [[ "$DISPLAY" && "$os" != "Mac OS X" && "$os" != "FreeMiNT" ]]; then
-        id="$(xprop -root -notype _NET_SUPPORTING_WM_CHECK)"
-        id="${id##* }"
-        wm="$(xprop -id "$id" -notype -len 100 -f _NET_WM_NAME 8t)"
-        wm="${wm/*WM_NAME = }"
-        wm="${wm/\"}"
-        wm="${wm/\"*}"
+        if type -p xprop &>/dev/null; then
+            id="$(xprop -root -notype _NET_SUPPORTING_WM_CHECK)"
+            id="${id##* }"
+            wm="$(xprop -id "$id" -notype -len 100 -f _NET_WM_NAME 8t)"
+            wm="${wm/*WM_NAME = }"
+            wm="${wm/\"}"
+            wm="${wm/\"*}"
+        fi

        # Window Maker does not set _NET_WM_NAME
        [[ "$wm" =~ "WINDOWMAKER" ]] && wm="wmaker"
@@ -1571,7 +1578,7 @@ get_wm_theme() {

        "Sawfish")
            wm_theme="$(awk -F '\\(quote|\\)' '/default-frame-style/ {print $(NF-4)}' \
-                      "${HOME}/.sawfish/custom")"
+                        "${HOME}/.sawfish/custom")"
        ;;

        "Cinnamon" | "Muffin" | "Mutter (Muffin)")
@@ -1675,7 +1682,7 @@ get_wm_theme() {
                wm_theme="$(awk '/(decoration)/ {gsub(/\[/,"",$1); print $1; exit}' "$kdebugrc")"
            fi

-            wm_theme="${wm_theme/'theme='}"
+            wm_theme="${wm_theme/theme=}"
        ;;

        "Quartz Compositor")
@@ -1706,7 +1713,7 @@ get_wm_theme() {
            path="${path//\\/\/}"

            wm_theme="$(grep '^session\.styleFile:' "${path/\.exe/.rc}")"
-            wm_theme="${wm_theme/'session.styleFile: '}"
+            wm_theme="${wm_theme/session\.styleFile: }"
            wm_theme="${wm_theme##*\\}"
            wm_theme="${wm_theme%.*}"
        ;;
@@ -1716,11 +1723,6 @@ get_wm_theme() {
 }

 get_cpu() {
-    # NetBSD emulates the Linux /proc filesystem instead of using sysctl for hw
-    # information so we have to use this block below which temporarily sets the
-    # OS to "Linux" for the duration of this function.
-    [[ "$distro" == "NetBSD"* ]] && local os="Linux"
-
    case "$os" in
        "Linux" | "MINIX" | "Windows")
            # Get CPU name.
@@ -1774,15 +1776,13 @@ get_cpu() {
            fi

            # Get CPU temp.
-            if [[ -f "$temp_dir" ]]; then
-                deg="$(< "$temp_dir")"
-                deg="$((deg * 100 / 10000))"
-            fi
+            [[ -f "$temp_dir" ]] && \
+                deg="$(($(< "$temp_dir") * 100 / 10000))"

            # Get CPU cores.
            case "$cpu_cores" in
                "logical" | "on") cores="$(grep -c "^processor" "$cpu_file")" ;;
-                "physical") cores="$(awk '/^core id/&&!a[$0]++{++i}END{print i}' "$cpu_file")" ;;
+                "physical") cores="$(awk '/^core id/&&!a[$0]++{++i} END {print i}' "$cpu_file")" ;;
            esac
        ;;

@@ -2029,7 +2029,7 @@ get_gpu() {
        "Linux")
            # Read GPUs into array.
            gpu_cmd="$(lspci -mm | awk -F '\\"|\\" \\"|\\(' \
-                                          '/"Display|"3D|"VGA/ {a[$0] = $3 " " $4} END{for(i in a)
+                                          '/"Display|"3D|"VGA/ {a[$0] = $3 " " $4} END {for(i in a)
                                           {if(!seen[a[i]]++) print a[i]}}')"
            IFS=$'\n' read -d "" -ra gpus <<< "$gpu_cmd"

@@ -2056,11 +2056,10 @@ get_gpu() {
                        brand="${brand:-${gpu/*AMD*/AMD}}"
                        brand="${brand:-${gpu/*ATI*/ATi}}"

-                        gpu="${gpu/'[AMD/ATI]' }"
-                        gpu="${gpu/'[AMD]' }"
+                        gpu="${gpu/\[AMD\/ATI\] }"
+                        gpu="${gpu/\[AMD\] }"
                        gpu="${gpu/OEM }"
                        gpu="${gpu/Advanced Micro Devices, Inc.}"
-                        gpu="${gpu/ \/ *}"
                        gpu="${gpu/*\[}"
                        gpu="${gpu/\]*}"
                        gpu="$brand $gpu"
@@ -2074,10 +2073,11 @@ get_gpu() {

                    *"intel"*)
                        gpu="${gpu/*Intel/Intel}"
-                        gpu="${gpu/'(R)'}"
-                        gpu="${gpu/'Corporation'}"
+                        gpu="${gpu/\(R\)}"
+                        gpu="${gpu/Corporation}"
                        gpu="${gpu/ \(*}"
                        gpu="${gpu/Integrated Graphics Controller}"
+                        gpu="${gpu/*Xeon*/Intel HD Graphics}"

                        [[ -z "$(trim "$gpu")" ]] && gpu="Intel Integrated Graphics"
                    ;;
@@ -2106,7 +2106,7 @@ get_gpu() {
            else
                gpu="$(system_profiler SPDisplaysDataType |\
                       awk -F': ' '/^\ *Chipset Model:/ {printf $2 ", "}')"
-                gpu="${gpu//'/ $'}"
+                gpu="${gpu//\/ \$}"
                gpu="${gpu%,*}"

                cache "gpu" "$gpu"
@@ -2166,7 +2166,7 @@ get_gpu() {

                *)
                    gpu="$(glxinfo | grep -F 'OpenGL renderer string')"
-                    gpu="${gpu/'OpenGL renderer string: '}"
+                    gpu="${gpu/OpenGL renderer string: }"
                ;;
            esac
        ;;
@@ -2234,13 +2234,13 @@ get_memory() {
                ;;

                "OpenBSD"*) ;;
-                *) mem_free="$(($(vmstat | awk 'END{printf $5}') / 1024))" ;;
+                *) mem_free="$(($(vmstat | awk 'END {printf $5}') / 1024))" ;;
            esac

            # Mem used.
            case "$kernel_name" in
                "OpenBSD"*)
-                    mem_used="$(vmstat | awk 'END{printf $3}')"
+                    mem_used="$(vmstat | awk 'END {printf $3}')"
                    mem_used="${mem_used/M}"
                ;;

@@ -2308,6 +2308,7 @@ get_song() {
        "cmus"
        "deadbeef"
        "deepin-music"
+        "dragon"
        "elise"
        "exaile"
        "gnome-music"
@@ -2326,6 +2327,7 @@ get_song() {
        "quodlibet"
        "rhythmbox"
        "sayonara"
+        "smplayer"
        "spotify"
        "Spotify"
        "tomahawk"
@@ -2335,7 +2337,8 @@ get_song() {
    )

    printf -v players "|%s" "${players[@]}"
-    player="$(ps -e | awk -v pattern="(${players:1})$" '$0 ~ pattern {print $NF; exit}')"
+    player="$(ps aux | awk -v pattern="(${players:1})" \
+                '!/ awk / && match($0,pattern){print substr($0,RSTART,RLENGTH); exit}')"

    [[ "$music_player" && "$music_player" != "auto" ]] && \
        player="$music_player"
@@ -2353,7 +2356,7 @@ get_song() {
    }

    case "${player/*\/}" in
-        "mpd"* | "mopidy"*) song="$(mpc -f '%artist% \n %album% \n %title%' current)" ;;
+        "mpd"*|"mopidy"*) song="$(mpc -f '%artist%\n%album%\n%title%' current "${mpc_args[@]}")" ;;
        "mocp"*)          song="$(mocp -Q '%artist \n %album \n %song')" ;;
        "google play"*)   song="$(gpmdp-remote current)" ;;
        "rhythmbox"*)     song="$(rhythmbox-client --print-playing-format '%ta \n %at \n %tt')" ;;
@@ -2374,6 +2377,10 @@ get_song() {
        "audacious"*)     get_song_dbus "audacious" ;;
        "vlc"*)           get_song_dbus "vlc" ;;
        "gmusicbrowser"*) get_song_dbus "gmusicbrowser" ;;
+        "pragha"*)        get_song_dbus "pragha" ;;
+        "amarok"*)        get_song_dbus "amarok" ;;
+        "dragon"*)        get_song_dbus "dragonplayer" ;;
+        "smplayer"*)      get_song_dbus "smplayer" ;;

        "cmus"*)
            song="$(cmus-remote -Q | awk 'BEGIN { ORS=" "};
@@ -2410,21 +2417,11 @@ get_song() {
        "banshee"*)
            song="$(banshee --query-artist --query-album --query-title |\
                    awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2}
-                    END{print a " \n " b " \n "t}')"
-        ;;
-
-        "amarok"*)
-            song="$(qdbus org.kde.amarok /Player GetMetadata |\
-                    awk -F':' '/^artist:/ {a=$2} /^album:/ {b=$2} /^title:/ {t=$2}
-                    END{print a " \n " b " \n " t}')"
-        ;;
-
-        "pragha"*)
-            song="$(pragha -c | awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2}
-                                END{print a " \n " b " \n " t}')"
+                               END {print a " \n " b " \n "t}')"
        ;;

        "exaile"*)
+            # NOTE: Exaile >= 4.0.0 will support mpris2.
            song="$(dbus-send --print-reply --dest=org.exaile.Exaile  /org/exaile/Exaile \
                    org.exaile.Exaile.Query |
                    awk -F':|,' '{if ($6 && $8 && $4) printf $6 " \n" $8 " \n" $4}')"
@@ -2434,7 +2431,7 @@ get_song() {
            song="$(dbus-send --print-reply --dest=net.sacredchao.QuodLibet \
                    /net/sacredchao/QuodLibet net.sacredchao.QuodLibet.CurrentSong |\
                    awk -F'"' '/artist/ {getline; a=$2} /album/ {getline; b=$2}
-                               /title/ {getline; t=$2} END{print a " \n " b " \n " t}')"
+                               /title/ {getline; t=$2} END {print a " \n " b " \n " t}')"
        ;;

        "pogo"*)
@@ -2754,14 +2751,14 @@ get_term() {
                term="$(tty)"
            ;;

-            "ruby"|"1"|"systemd"|"sshd"*|"python"*|"USER"*"PID"*|"kdeinit"*|"launchd"*)
+            "ruby"|"1"|"tmux"*|"systemd"|"sshd"*|"python"*|"USER"*"PID"*|"kdeinit"*|"launchd"*)
                break
            ;;

            "gnome-terminal-") term="gnome-terminal" ;;
+            "urxvtd")          term="urxvt" ;;
            *"nvim")           term="Neovim Terminal" ;;
            *"NeoVimServer"*)  term="VimR Terminal" ;;
-            *"tmux"*)          term="tmux" ;;
            *)                 term="${name##*/}" ;;
        esac
    done
@@ -2842,13 +2839,13 @@ END
        ;;

        "deepin-terminal"*)
-            term_font="$(awk -F '=' '/font=/ {a=$2} /font_size/ {b=$2} END{print a " " b}' \
+            term_font="$(awk -F '=' '/font=/ {a=$2} /font_size/ {b=$2} END {print a " " b}' \
                         "${XDG_CONFIG_HOME}/deepin/deepin-terminal/config.conf")"
        ;;

        "GNUstep_Terminal")
             term_font="$(awk -F '>|<' '/>TerminalFont</ {getline; f=$3}
-                          />TerminalFontSize</ {getline; s=$3} END{print f " " s}' \
+                          />TerminalFontSize</ {getline; s=$3} END {print f " " s}' \
                          "${HOME}/GNUstep/Defaults/Terminal.plist")"
        ;;

@@ -2875,7 +2872,7 @@ END
                              END { print font " " size}' "${confs[0]}")"
        ;;

-        "konsole"*)
+        "konsole" | "yakuake")
            # Get Process ID of current konsole window / tab
            child="$(get_ppid "$$")"

@@ -2927,7 +2924,7 @@ END
                                            if(/Fullscreen/) getline;
                                            id=$2"]"
                                         } $0~id {if(id) {getline; print $2; exit}}' \
-                          "$mateterm_config")"
+                           "$mateterm_config")"

                rm -f "$mateterm_config"

@@ -2958,7 +2955,7 @@ END
        ;;

        "qterminal")
-            term_font="$(awk -F '=' '/fontFamily=/ {a=$2} /fontSize=/ {b=$2} END{print a " " b}' \
+            term_font="$(awk -F '=' '/fontFamily=/ {a=$2} /fontSize=/ {b=$2} END {print a " " b}' \
                         "${XDG_CONFIG_HOME}/qterminal.org/qterminal.ini")"
        ;;

@@ -3019,7 +3016,7 @@ END

        "urxvt" | "urxvtd" | "rxvt-unicode" | "xterm")
            xrdb="$(xrdb -query)"
-            term_font="$(grep -i "${term/d}"'\**\.*font' <<< "$xrdb")"
+            term_font="$(grep -im 1 -e "^${term/d}"'\**\.*font' -e '^\*font' <<< "$xrdb")"
            term_font="${term_font/*"*font:"}"
            term_font="${term_font/*".font:"}"
            term_font="${term_font/*"*.font:"}"
@@ -3050,7 +3047,7 @@ END
        ;;

        "xfce4-terminal")
-            term_font="$(awk -F '=' '/^FontName/{a=$2}/^FontUseSystem=TRUE/{a=$0}END{print a}' \
+            term_font="$(awk -F '=' '/^FontName/{a=$2}/^FontUseSystem=TRUE/{a=$0} END {print a}' \
                         "${XDG_CONFIG_HOME}/xfce4/terminal/terminalrc")"

            [[ "$term_font" == "FontUseSystem=TRUE" ]] && \
@@ -3096,7 +3093,7 @@ get_disk() {
    for disk in "${disks[@]}"; do
        # Create a second array and make each element split at whitespace this time.
        IFS=" " read -ra disk_info <<< "$disk"
-        disk_perc="${disk_info[4]/'%'}"
+        disk_perc="${disk_info[4]/\%}"

        case "$df_version" in
            *"befhikm"*)
@@ -3179,12 +3176,19 @@ get_battery() {
                ;;

                "OpenBSD"* | "Bitrig"*)
-                    battery0full="$(sysctl -n hw.sensors.acpibat0.watthour0)"
-                    battery0full="${battery0full/ Wh*}"
+                    battery0full="$(sysctl -n   hw.sensors.acpibat0.watthour0\
+                                                hw.sensors.acpibat0.amphour0)"
+                    battery0full="${battery0full%% *}"

-                    battery0now="$(sysctl -n hw.sensors.acpibat0.watthour3)"
-                    battery0now="${battery0now/ Wh*}"
+                    battery0now="$(sysctl -n    hw.sensors.acpibat0.watthour3\
+                                                hw.sensors.acpibat0.amphour3)"
+                    battery0now="${battery0now%% *}"

+                    state="$(sysctl -n hw.sensors.acpibat0.raw0)"
+                    state="${state##? (battery }"
+                    state="${state%)*}"
+
+                    [[ "${state}" == "charging" ]] && battery_state="charging"
                    [[ "$battery0full" ]] && \
                    battery="$((100 * ${battery0now/\.} / ${battery0full/\.}))%"
                ;;
@@ -3213,9 +3217,9 @@ get_battery() {
    [[ "$battery_state" ]] && battery+=" Charging"

    case "$battery_display" in
-        "bar")     battery="$(bar "${battery/'%'*}" 100)" ;;
-        "infobar") battery="${battery} $(bar "${battery/'%'*}" 100)" ;;
-        "barinfo") battery="$(bar "${battery/'%'*}" 100)${info_color} ${battery}" ;;
+        "bar")     battery="$(bar "${battery/\%*}" 100)" ;;
+        "infobar") battery="${battery} $(bar "${battery/\%*}" 100)" ;;
+        "barinfo") battery="$(bar "${battery/\%*}" 100)${info_color} ${battery}" ;;
    esac
 }

@@ -3243,7 +3247,7 @@ get_local_ip() {

        "Haiku")
            local_ip="$(ifconfig | awk -F ': ' '/Bcast/ {print $2}')"
-            local_ip="${local_ip/', Bcast'}"
+            local_ip="${local_ip/, Bcast}"
        ;;
    esac
 }
@@ -3361,7 +3365,7 @@ image_backend() {
                return
            }

-            get_term_size
+            get_window_size

            ((term_width < 1)) && {
                to_ascii "Image: Failed to find terminal window size."
@@ -3389,7 +3393,7 @@ image_backend() {
 }

 get_ascii() {
-    if [[ -f "$image_source" ]]; then
+    if [[ -f "$image_source" && ! "$image_source" =~ (png|jpg|jpeg|jpe|svg|gif) ]]; then
        ascii_data="$(< "$image_source")"
    else
        err "Ascii: Ascii file not found, using distro ascii."
@@ -3400,8 +3404,7 @@ get_ascii() {

    # Calculate size of ascii file in line length / line count.
    while IFS=$'\n' read -r line; do
-        ((${#line} > ascii_length)) && ascii_length="${#line}"
-        ((++lines))
+        ((++lines,${#line}>ascii_length)) && ascii_length="${#line}"
    done <<< "${ascii_data//\$\{??\}}"

    # Colors.
@@ -3413,7 +3416,7 @@ get_ascii() {
    ascii_data="${ascii_data//\$\{c6\}/$c6}"

    ((text_padding=ascii_length+gap))
-    printf '%b\n' "$ascii_data"
+    printf '%b\n' "$ascii_data${reset}"
    LC_ALL=C
 }

@@ -3488,6 +3491,11 @@ END
                    image="$(decode_url "$image")"
                ;;

+                "GNOME"*)
+                    image="$(gsettings get org.gnome.desktop.background picture-uri)"
+                    image="$(decode_url "$image")"
+                ;;
+
                *)
                    if type -p feh >/dev/null && [[ -f "${HOME}/.fehbg" ]]; then
                        image="$(awk -F\' '/feh/ {printf $(NF-1)}' "${HOME}/.fehbg")"
@@ -3509,7 +3517,7 @@ END
            esac

            # Strip un-needed info from the path.
-            image="${image/'file://'}"
+            image="${image/file:\/\/}"
            image="$(trim_quotes "$image")"
        ;;
    esac
@@ -3530,11 +3538,11 @@ get_w3m_img_path() {
    err "Image: w3m-img wasn't found on your system"
 }

-get_term_size() {
+get_window_size() {
    # This functions gets the current window size in
    # pixels.
    #
-    # We first try to use the escape sequence "\044[14t"
+    # We first try to use the escape sequence "\033[14t"
    # to get the terminal window size in pixels. If this
    # fails we then fallback to using "xdotool" or other
    # programs.
@@ -3606,14 +3614,19 @@ get_term_size() {
    term_width="${term_width:-0}"
 }

-get_image_size() {
-    # This functions determines the size to make
-    # the thumbnail image.
-    read -r lines columns <<< "$(stty size)"
+
+get_term_size() {
+    # Get the terminal size in cells.
+    read -r lines columns < <(stty size)

    # Calculate font size.
    font_width="$((term_width / columns))"
    font_height="$((term_height / lines))"
+}
+
+get_image_size() {
+    # This functions determines the size to make the thumbnail image.
+    get_term_size

    case "$image_size" in
        "auto")
@@ -3635,17 +3648,15 @@ get_image_size() {
        "none")
            # Get image size so that we can do a better crop.
            read -r width height <<< "$(identify -format "%w %h" "$image")"
-            crop_mode="none"

            while ((width >= (term_width / 2) || height >= term_height)); do
-                ((width=width/2))
-                ((height=height/2))
+                ((width=width/2,height=height/2))
            done
+
+            crop_mode="none"
        ;;

-        *)
-            image_size="${image_size/px}"
-        ;;
+        *)  image_size="${image_size/px}" ;;
    esac

    width="${width:-$image_size}"
@@ -4063,7 +4074,7 @@ get_user_config() {

    elif [[ -f "${files[0]}" ]]; then
        source "${files[0]}"
-        err "Config: Sourced user config.    (${config_file})"
+        err "Config: Sourced user config.    (${files[0]})"

    else
        config_file="${XDG_CONFIG_HOME}/neofetch/config.conf"
@@ -4150,6 +4161,14 @@ cache_uname() {
    kernel_name="${uname[0]}"
    kernel_version="${uname[1]}"
    kernel_machine="${uname[2]}"
+
+    if [[ "$kernel_name" == "Darwin" ]]; then
+        IFS=$'\n' read -d "" -ra sw_vers < <(awk -F'<|>' '/string/ {print $3}' \
+                            "/System/Library/CoreServices/SystemVersion.plist")
+        darwin_name="${sw_vers[2]}"
+        osx_version="${sw_vers[3]}"
+        osx_build="${sw_vers[0]}"
+    fi
 }

 get_ppid() {
@@ -4157,7 +4176,7 @@ get_ppid() {
    case "$os" in
        "Windows")
            ppid="$(ps -p "${1:-$PPID}" | awk '{printf $2}')"
-            ppid="${ppid/'PPID'}"
+            ppid="${ppid/PPID}"
        ;;

        "Linux")
@@ -4178,7 +4197,7 @@ get_process_name() {
    case "$os" in
        "Windows")
            name="$(ps -p "${1:-$PPID}" | awk '{printf $8}')"
-            name="${name/'COMMAND'}"
+            name="${name/COMMAND}"
            name="${name/*\/}"
        ;;

@@ -4645,7 +4664,8 @@ get_args() {
                cpu_temp="C"

                # Known implicit unused variables.
-                printf '%s\n' "$kernel $icons $font $battery $locale"
+                mpc_args=()
+                printf '%s\n' "$kernel $icons $font $battery $locale ${mpc_args[*]}"
            ;;
        esac

@@ -4934,7 +4954,7 @@ ${c1}      /\
   /${c2}  __  \
  /  (  )  \
 / __|  |__\\\
-///        \\\\\
+///        \\\\\\
 EOF
        ;;

@@ -5403,6 +5423,32 @@ ${c1}            ..,:${c3}dOkxl:.
 EOF
        ;;

+        "ClearOS"*)
+            set_colors 2
+            read -rd '' ascii_data <<'EOF'
+${c1}             `.--::::::--.`
+         .-:////////////////:-.
+      `-////////////////////////-`
+     -////////////////////////////-
+   `//////////////-..-//////////////`
+  ./////////////:      ://///////////.
+ `//////:..-////:      :////-..-//////`
+ ://////`    -///:.``.:///-`    ://///:
+`///////:.     -////////-`    `:///////`
+.//:--////:.     -////-`    `:////--://.
+./:    .////:.     --`    `:////-    :/.
+`//-`    .////:.        `:////-    `-//`
+ :///-`    .////:.    `:////-    `-///:
+ `/////-`    -///:    :///-    `-/////`
+  `//////-   `///:    :///`   .//////`
+   `:////:   `///:    :///`   -////:`
+     .://:   `///:    :///`   -//:.
+       .::   `///:    :///`   -:.
+             `///:    :///`
+              `...    ...`
+EOF
+        ;;
+
        "Clover"*)
            set_colors 2 6
            read -rd '' ascii_data <<'EOF'
@@ -6093,6 +6139,24 @@ WW                           W
 EOF
        ;;

+        "januslinux"*)
+            set_colors 7
+            read -rd '' ascii_data <<'EOF'
+${c1} ________________
+|\               \
+| \               \
+|  \               \
+|   \ ______________\
+|    |              |
+|    |              |
+|    |              |
+ \   |  januslinux  |
+  \  |              |
+   \ |              |
+    \|______________|
+EOF
+        ;;
+
        "Kali"*)
            set_colors 4 8
            read -rd '' ascii_data <<'EOF'
--- a/neofetch.1
+++ b/neofetch.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH NEOFETCH "1" "June 2018" "Neofetch 4.0.3" "User Commands"
+.TH NEOFETCH "1" "June 2018" "Neofetch 5.0.1" "User Commands"
 .SH NAME
 Neofetch \- A fast, highly customizable system info script
 .SH SYNOPSIS
@@ -23,7 +23,7 @@ For example: 'info "Memory" memory' would be '\-\-disable memory'
 NOTE: You can supply multiple args. eg. 'neofetch \fB\-\-disable\fR cpu gpu'
 .TP
 \fB\-\-package_managers\fR on/off
-Hide/Show Package Manager names.
+Hide/Show Package Manager names . (tiny, on, off)
 .TP
 \fB\-\-os_arch\fR on/off
 Hide/Show OS architecture.
@@ -260,8 +260,6 @@ Whether or not to bold the ascii logo.
 .TP
 \fB\-L\fR, \fB\-\-logo\fR
 Hide the info text and only show the ascii logo.
-.IP
-Possible values: bar, infobar, barinfo, off
 .SS "IMAGE:"
 .TP
 \fB\-\-loop\fR
Author	SHA1	Message	Date
Muhammad Herdiansyah	754ffe2fae	get_ascii: Do not parse file if it's an image file	2018-08-24 11:07:36 +07:00
Muhammad Herdiansyah	17f2f5b2a6	docs: changelog	2018-08-16 13:54:21 +07:00
Muhammad Herdiansyah	8ee4710225	Packages: pkginfo is used by CRUX and JanusLinux	2018-08-16 13:54:20 +07:00
Muhammad Herdiansyah	b8eb8fbaa7	docs: changelog	2018-08-16 13:24:20 +07:00
Muhammad Herdiansyah	3b5ec364e6	Merge pull request #1073 from plgruener/colorreset	2018-08-16 13:19:41 +07:00
Muhammad Herdiansyah	6c38b81fe1	Merge pull request #1072 from plgruener/arch_small fix arch_small logo	2018-08-16 13:19:09 +07:00
Muhammad Herdiansyah	6775a652d3	Merge pull request #1063 from plgruener/yakuake add term-font support for yakuake	2018-08-16 13:15:40 +07:00
plgruener	5d33b8d99d	fix arch_small logo	2018-08-15 17:38:02 +02:00
plgruener	614fad0421	add color-reset to ascii logo drawing	2018-08-15 17:29:54 +02:00
plgruener	2fef4d9849	add term-font support for yakuake	2018-07-31 18:03:29 +02:00
Muhammad Herdiansyah	78f355ba6d	docs: changelog	2018-07-27 10:26:43 +07:00
M. Herdiansyah	085bba208a	Merge pull request #1062 from alyssais/mac_nix Add support for Nix packages on macOS	2018-07-27 10:23:38 +07:00
M. Herdiansyah	9fe7ec4ccf	Merge pull request #1057 from nero/mksh-nospace-fix Fix borked version display for mksh	2018-07-27 10:20:38 +07:00
Alyssa Ross	2cc7b84189	Add support for Nix packages on macOS	2018-07-26 15:19:03 +01:00
Muhammad Herdiansyah	2afc5a27af	GPU [AMD]: Remove an unnecessary pattern check	2018-07-24 12:26:18 +07:00
Ain	f960594cd4	Fix borked version display for mksh `"$SHELL" -c "printf %s \$KSH_VERSION"` as part of the shell version detection for ksh and mksh was expanding to `printf %s $KSH_VERSION` inside of shell. This resulted in `$KSH_VERSION` being substituted as multiple arguments to printf. While (afaik) unspecified, mksh, bash and zsh resort to repeating the format strings. This resulted in all spaces missing from `$shell`, which in turn caused the string cleanup to fail: `Shell: mksh @MIRBSDKSHR562017/08/29` Quoting `$KSH_VERSION` causes it to be given to printf as a single argument, which preserves its spaces. The output after this change looks like follows: `Shell: mksh R56 2017/08/29`	2018-07-17 11:56:44 +00:00
Dylan Araps	71df4ffd3b	Merge pull request #1056 from julianaito/master battery/OpenBSD: improved charge%, adds status	2018-07-17 09:01:02 +10:00
Charlène	1332874265	battery/OpenBSD: improved charge%, adds status This commit adds support for hw.sensors.acpibat0.amphour[03] for battery charge statistics in addition to watthour[03]. It also adds charging status.	2018-07-16 22:58:47 +02:00
Dylan Araps	22df76c3b6	cpu: Use sysctl on NetBSD. Closes #1041	2018-06-25 09:04:48 +10:00
Dylan Araps	497b782ea1	Merge branch 'master' of github.com:dylanaraps/neofetch	2018-06-25 07:49:49 +10:00
Dylan Araps	c99fc64b67	misc: Fixed substitutions.	2018-06-25 07:49:12 +10:00
Dylan Araps	d43da37d00	Merge pull request #1042 from erikdubois/master Update neofetch	2018-06-23 15:11:22 +10:00
Erik Dubois	911c70adc3	Update neofetch	2018-06-23 06:56:54 +02:00
Dylan Araps	f70390ede0	Merge pull request #1040 from corollari/patch-1 Fix #1039	2018-06-22 10:56:30 +10:00
Albert	c651f5e068	Fix #1039	2018-06-22 00:55:39 +02:00
Dylan Araps	288036eb26	misc: cleanup	2018-06-21 17:21:08 +10:00
Dylan Araps	aae3271422	wallpaper: Fixed GNOME support. Closes #1037	2018-06-21 14:36:33 +10:00
Dylan Araps	61ee751147	docs: update	2018-06-21 13:55:44 +10:00
Dylan Araps	50804a6877	gpu: Change Xeon output to HD Graphics	2018-06-20 21:48:16 +10:00
Dylan Araps	ef94cc6764	Merge branch 'master' of github.com:dylanaraps/neofetch	2018-06-20 10:32:33 +10:00
Dylan Araps	31af4fe003	misc: cleanup	2018-06-20 10:31:55 +10:00
Dylan Araps	1da3523e9e	Merge pull request #1035 from protonesso/master OS: add januslinux	2018-06-20 07:41:16 +10:00
tsumiki.neko	a596b6467f	add januslinux	2018-06-19 22:17:53 +03:00
Dylan Araps	c152801a8a	misc: cleanup	2018-06-19 16:13:09 +10:00
Dylan Araps	97b4f04d33	term: [urxvt/xterm] Show greedy fonts.	2018-06-19 16:02:24 +10:00
Dylan Araps	cf07cb0c35	term: Show URxvtd as URxvt	2018-06-19 15:46:51 +10:00
Dylan Araps	af455b2967	misc: Check if xprop is installed	2018-06-19 14:20:44 +10:00
Dylan Araps	bdd21fa8a7	misc: cleanup	2018-06-19 09:52:20 +10:00
Dylan Araps	8a2e973814	misc: cleanup	2018-06-19 09:46:53 +10:00
Dylan Araps	2bdb5f3b01	docs: update	2018-06-19 09:42:08 +10:00
Dylan Araps	d35574352f	misc: cleanup	2018-06-19 09:41:27 +10:00
Dylan Araps	01bd13a3b5	song: Fix detection.	2018-06-19 09:37:10 +10:00
Dylan Araps	94362674f2	image: Use stty instead of sequence first.	2018-06-19 09:21:48 +10:00
Dylan Araps	2783446387	fix tests	2018-06-19 09:09:09 +10:00
Dylan Araps	afb6782a88	fix tests	2018-06-19 09:08:02 +10:00
Dylan Araps	24f5259339	fix tests	2018-06-19 09:04:10 +10:00
Dylan Araps	536c0b0ef7	Merge branch 'master' of github.com:dylanaraps/neofetch	2018-06-19 08:59:30 +10:00
Dylan Araps	b3e6b7e818	song: Added mpc_args to specify arguments for mpc. Closes #1033	2018-06-19 08:59:14 +10:00
Dylan Araps	4ac3dedaa0	Merge pull request #1032 from mstraube/clearos OS: Add support for ClearOS	2018-06-15 06:30:17 +10:00
Michael Straube	1fc48be2f4	OS: Add support for ClearOS	2018-06-14 20:50:05 +02:00
Dylan Araps	dfafca9f62	Merge pull request #1030 from mstraube/song Song: Add Dragon Player and SMPlayer	2018-06-14 06:44:37 +10:00
Michael Straube	ea462a8ec1	song: Add SMPlayer	2018-06-13 18:03:51 +02:00
Michael Straube	94ae0099be	song: Add Dragon Player	2018-06-13 17:58:41 +02:00
Dylan Araps	e7306982e9	packages: Fix bug with dpkg	2018-06-09 17:48:49 +10:00
Dylan Araps	40bf68af26	packages: Fix dpkg bug.	2018-06-09 17:40:09 +10:00
Dylan Araps	078cda7b48	misc: cleanup	2018-06-09 17:23:42 +10:00
Dylan Araps	329abc5c46	Merge branch 'master' of github.com:dylanaraps/neofetch	2018-06-09 17:23:07 +10:00
Dylan Araps	440e8ca7b1	packages: Fix bug with snapd. Closes #1026	2018-06-09 17:22:51 +10:00
Dylan Araps	34eacd561b	Merge pull request #1025 from mstraube/song song: use get_song_dbus for amarok	2018-06-09 06:40:33 +10:00
Michael Straube	abe6b82fc7	song: add comment for exaile	2018-06-08 14:18:56 +02:00
Michael Straube	26389a8423	song: use get_song_dbus for amarok	2018-06-08 13:56:45 +02:00
Dylan Araps	daf866039e	Merge pull request #1023 from mstraube/pragha song: use get_song_dbus for pragha	2018-06-08 04:58:22 +10:00
Michael Straube	059239d2a7	song: use get_song_dbus for pragha	2018-06-07 13:47:13 +02:00
Dylan Araps	8cfabdae47	Merge pull request #1021 from mstraube/indent misc: indent	2018-06-06 20:39:06 +00:00
Michael Straube	b30151e6dd	misc: indent	2018-06-06 18:02:07 +02:00
Dylan Araps	93ffa118a3	Merge pull request #1020 from MindTooth/fix_end awk: Space around END	2018-06-05 20:07:01 +00:00
Birger J. Nordølum	e7645597e1	awk: Space around END	2018-06-05 19:33:20 +02:00
Andrew Titmuss	428b73fc5a	os: add cache_uname for Darwin (macOS/iOS)	2018-06-05 23:13:20 +10:00
Dylan Araps	e95776d40b	misc: cleanup	2018-06-05 13:12:29 +10:00
Dylan Araps	d8f7e8df54	config: Fixed incorrect error message	2018-06-05 12:20:12 +10:00
Dylan Araps	bc9fd232e4	distro: Fixed file error	2018-06-05 12:19:18 +10:00
Dylan Araps	f847b05e32	image: Added method to get the terminal size using an escape sequence.	2018-06-05 11:50:55 +10:00