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

docs: changelog
Packages: pkginfo is used by CRUX and JanusLinux
2025-12-13 12:12: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
7 changed files with 1304 additions and 1373 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,14 +9,15 @@ before_install:
    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install screenresolution; fi

+install:
+  # Install a custom version of shellcheck instead of Travis CI's default
+  - scversion="latest" # or "v0.4.7", or "latest"
+  - wget "https://storage.googleapis.com/shellcheck/shellcheck-${scversion}.linux.x86_64.tar.xz"
+  - tar --xz -xvf "shellcheck-${scversion}.linux.x86_64.tar.xz"
+  - shellcheck() { "shellcheck-${scversion}/shellcheck" "$@"; }
+
 script:
    - time ./neofetch --travis -v
-    # See this wiki page for why we're disabling these errors.
-    # https://github.com/dylanaraps/neofetch/wiki/Shellcheck-Exclusions
-    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,SC2178,SC2010,SC1004,SC1091,SC1117; fi
-    # The if statement is here to invert the exit code from grep.
-    # grep normally errors if no match is found but we want the opposite.
-    # We invert it so grep fails if a match is found.
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch; fi
    # Check for lines longer than 100 chars.
-    # There are 3 lines that must be longer than 100 chars.
-    - if (("$(grep '.\{101\}' neofetch | wc -l)" > 3)); then (exit 1); else (exit 0); fi
+    - if grep '.\{102\}' neofetch; then (exit 1); else (exit 0); fi
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,127 @@ 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**
+
+- [**@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. [**@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.
+- Added support for Linux Lite.
+- Added support for macOS 10.14 Mojave. [**@iandrewt**](https://github.com/iandrewt)
+
+**General**
+
+- **output**: Added `--json` to output the info in `json`.
+- **cursor**: Fixed prompt location issues after Neofetch is run.
+- **macOS**: Fixed neofetch launching XQuartz.
+- **misc**: Removed `uppercase()`.
+- **misc**: Removed all instances of `export`.
+- **misc**: Removed all deprecated options and functions.
+- **info**: Removed `get_install_date()`.
+
+**Ascii**
+
+- Fixed a bug causing Windows 7 ASCII art to not display.
+- Simplified ASCII art handling.
+- Updated Funtoo ASCII art.
+
+**Image**
+
+- Improved performance of image handling.
+- Removed `catimg` support (*It didn’t allow us to specify height so we
+  couldn’t accurately place the cursor*).
+- Fixed `tycat`, `sixel` and `kitty icat` image sizes.
+- Simplified `w3m-img` code.
+
+**Screenshot**
+
+See: https://github.com/dylanaraps/neofetch/issues/1001
+
+- Removed screenshot functionality.
+- Removed screenshot upload functionality.
+
+**Info**
+
+- **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")
+- **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 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`. [**@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`.
+
+- [config] Fixed issue with default config in bash3.
+- [packages] Simplified code.
+- [term] Fixed macOS issue.
+- [term] Fixed `tmux` issue.
+
+
+## [4.0.0] - 2018-05-17
+
+<h1><img src="https://i.imgur.com/JFxwJtU.png" alt="logo" height="100px"></h1>
+
 This release bumps the version number up to `4.0.0` as it contains major
 changes to how Neofetch is packaged and installed.

@@ -14,15 +135,21 @@ The entirety of Neofetch is now contained within a single executable.
 Everything has been in-lined. Installing Neofetch is now as easy as
 downloading the script and running it.

-Packaging Neofetch is now easier as well. We were using `sed` in the
-`Makefile` to replace specific paths and we have had to work around
-different system hierarchies. None of this is necessary anymore.
-
 Those using distributions with an outdated Neofetch version in their repos
-can now easily install the latest version.
+can now easily install the latest version themselves.

 Thanks to those who contributed this time around and thanks to those who
-discussed proposed changes in the bug tracker. I appreciate it. :+1:
+discussed proposed changes in the bug tracker and Discord. I appreciate
+it. :+1:
+
+
+## Discord
+
+Neofetch now has a Discord server. Come and join the discussion!
+
+<a
+href="https://discord.gg/BtnTPFF"><img
+src="https://img.shields.io/discord/440354555197128704.svg"></a>


 ## Contributors
@@ -36,6 +163,8 @@ discussed proposed changes in the bug tracker. I appreciate it. :+1:
 - [**@TsundereBug**](https://github.com/TsundereBug)
 - [**@dawidd6**](https://github.com/dawidd6)
 - [**@mstraube**](https://github.com/mstraube)
+- [**@iandrewt**](https://github.com/iandrewt)
+- [**@MindTooth**](https://github.com/MindTooth)


 ## Operating System
@@ -64,6 +193,14 @@ discussed proposed changes in the bug tracker. I appreciate it. :+1:

 ## Info

+**Song**
+
+- Added support for VLC. [**@mstraube**](https://github.com/mstraube)
+- Added support for Sayonara. [**@mstraube**](https://github.com/mstraube)
+- Added album data to song output. [**@mstraube**](https://github.com/mstraube), [**@iandrewt**](https://github.com/iandrewt)
+- Added `song_format` to change the display format of the data.
+    - Default: `%artist% - %album% - %title%`.
+
 **Title**

 - Fixed unexpected backslash being inserted on some systems.
@@ -80,6 +217,7 @@ discussed proposed changes in the bug tracker. I appreciate it. :+1:

 - Added support for `st`. [**@aidanharris**](https://github.com/aidanharris)
 - Added support for `qterminal`. [**@mstraube**](https://github.com/mstraube)
+- Fixed `kitty` font bug. [**@MindTooth**](https://github.com/MindTooth)

 **Packages**

@@ -2638,7 +2776,11 @@ Changelog:
 Let me know if you're having issues.


-[Unreleased]: https://github.com/dylanaraps/neofetch/compare/3.4.0...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
 [3.4.0]: https://github.com/dylanaraps/neofetch/compare/3.3.0...3.4.0
 [3.3.0]: https://github.com/dylanaraps/neofetch/compare/3.2.0...3.3.0
 [3.2.0]: https://github.com/dylanaraps/neofetch/compare/3.1.0...3.2.0
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -23,20 +23,15 @@
  and variable names.
 - Keep lines below `100` characters long.
 - Use `[[ ]]` for tests.
- Double Quote **EVERYTHING**.
- Don’t use single quotes, except for special cases.
+- Quote **EVERYTHING**.

 ### ShellCheck

 For your contribution to be accepted, your changes need to pass
 ShellCheck.

-Run ShellCheck with the following command:
-
 ```sh
-# Why do we exclude numerous tests?
-# See: https://github.com/dylanaraps/neofetch/wiki/Shellcheck-Exclusions
-shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,SC2178,SC2010,SC1004,SC1091,SC1117
+shellcheck neofetch
 ```

 **Note**: If you have trouble installing ShellCheck. You can open a pull
@@ -58,6 +53,8 @@ request on the repo and our Travis.ci hook will run ShellCheck for you.
    - Use `bash`'s built-in syntax (`file="$(< /path/to/file.txt)")`).
 - Don’t use `grep "pattern" | awk '{ printf }'`.
    - Use `awk '/pattern/ { printf }'`
+- Don’t use `wc`.
+    - Use `${#var}` or `${#arr[@]}`.


 ### If Statements
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2016-2017 Dylan Araps
+Copyright (c) 2016-2018 Dylan Araps

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.md
+++ b/README.md
@@ -1,14 +1,16 @@
-# Neofetch
+<h3 align="center"><img src="https://i.imgur.com/ZQI2EYz.png" alt="logo" height="100px"></h3>
+<p align="center">A command-line system information tool written in bash 3.2+</p>

-<a href="https://repology.org/metapackage/neofetch">
-    <img src="https://repology.org/badge/vertical-allrepos/neofetch.svg" alt="Packaging status" align="right" width="150px" height="730px">
-</a>
+<p align="center">
+<a href="https://discord.gg/BtnTPFF"><img src="https://img.shields.io/discord/440354555197128704.svg"></a>
+<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://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>

-[![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch)
-[![GitHub last commit](https://img.shields.io/github/last-commit/google/skia.svg)](https://github.com/dylanaraps/neofetch)
-[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md)
-[![Latest release](https://img.shields.io/github/release/dylanaraps/neofetch.svg)](https://github.com/dylanaraps/neofetch/releases)
-[![Donate](https://img.shields.io/badge/donate-patreon-yellow.svg)](https://www.patreon.com/dyla)
+<img src="https://i.imgur.com/GFmC5Ad.png" alt="neofetch" align="right" height="240px">

 Neofetch is a command-line system information tool written in `bash 3.2+`. Neofetch displays information about your operating system, software and hardware in an aesthetic and visually pleasing way.

@@ -16,15 +18,14 @@ The overall purpose of Neofetch is to be used in screen-shots of your system. Ne

 The information by default is displayed alongside your operating system's logo. You can further configure Neofetch to instead use an image, a custom ASCII file, your wallpaper or nothing at all.

+<img src="https://i.imgur.com/lUrkQBN.png" alt="neofetch" align="right" height="240px">
+
 You can further configure Neofetch to display exactly what you want it to. Through the use of command-line flags and the configuration file you can change existing information outputs or add your own custom ones.

-Neofetch supports almost 150 different operating systems. From Linux to Windows, all the way to more obscure operating systems like Minix, AIX and Haiku. If your favourite operating system is unsupported: Open up an issue and support will be added.<br>
+Neofetch supports almost 150 different operating systems. From Linux to Windows, all the way to more obscure operating systems like Minix, AIX and Haiku. If your favourite operating system is unsupported: Open up an issue and support will be added.


-### For more information: \[[Dependencies](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[Installation](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[Wiki](https://github.com/dylanaraps/neofetch/wiki)\]
-
-<img src="https://i.imgur.com/lUrkQBN.png" alt="neofetch" align="right" width="349px">
-<img src="https://i.imgur.com/GFmC5Ad.png" alt="neofetch" width="349px">
+### More: \[[Dependencies](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[Installation](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[Wiki](https://github.com/dylanaraps/neofetch/wiki)\]

 ## Articles

@@ -41,6 +42,8 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows,
 - https://www.techrepublic.com/article/how-to-get-all-the-information-you-need-about-your-linux-machine-with-a-single-command/
 - https://www.tecmint.com/neofetch-shows-linux-system-information-with-logo/
 - https://www.youtube.com/watch?v=bgepGW858fc
+- https://www.linuxuprising.com/2018/05/display-system-information-on-linux.html
+- https://esgeeks.com/neofetch-informacion-sistema-linux/


 ## Thanks
@@ -53,6 +56,7 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows,

 ## Donate

-Donations will allow me to spend more time working on `neofetch`.
+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-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>

-If you like `neofetch` and want to give back in some way you can donate here: **https://patreon.com/dyla**
--- a/2410
+++ b/2410
--- 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" "May 2018" "Neofetch 3.4.1-git" "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
@@ -16,10 +16,15 @@ NOTE: Every launch flag has a config option.
 .TP
 \fB\-\-disable\fR infoname
 Allows you to disable an info line from appearing
-in the output.
+in the output. 'infoname' is the function name from the
+\&'print_info()' function inside the config file.
+For example: 'info "Memory" memory' would be '\-\-disable memory'
 .IP
 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 . (tiny, on, off)
+.TP
 \fB\-\-os_arch\fR on/off
 Hide/Show OS architecture.
 .TP
@@ -115,18 +120,15 @@ Takes: name, mount, dir
 \fB\-\-ip_host\fR url
 URL to query for public IP
 .TP
+\fB\-\-song_format\fR format
+Print the song data in a specific format (see config file).
+.TP
 \fB\-\-song_shorthand\fR on/off
-Print the Artist/Title on separate lines
+Print the Artist/Album/Title on separate lines.
 .TP
 \fB\-\-music_player\fR player\-name
 Manually specify a player to use.
 Available values are listed in the config file
-.TP
-\fB\-\-install_time\fR on/off
-Enable/Disable showing the time in Install Date output.
-.TP
-\fB\-\-install_time_format\fR 12h/24h
-Set time format in Install Date to be 12 hour or 24 hour.
 .SS "TEXT FORMATTING:"
 .TP
 \fB\-\-colors\fR x x x x x x
@@ -188,7 +190,7 @@ Possible values: bar, infobar, barinfo, off
 .TP
 \fB\-\-backend\fR backend
 Which image backend to use.
-Possible values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off',
+Possible values: 'ascii', 'caca', 'jp2a', 'iterm2', 'off',
 \&'sixel', 'tycat', 'w3m'
 .TP
 \fB\-\-source\fR source
@@ -202,9 +204,6 @@ Shortcut to use 'ascii' backend.
 \fB\-\-caca\fR source
 Shortcut to use 'caca' backend.
 .TP
-\fB\-\-catimg\fR source
-Shortcut to use 'catimg' backend.
-.TP
 \fB\-\-iterm2\fR source
 Shortcut to use 'iterm2' backend.
 .TP
@@ -230,7 +229,7 @@ Shortcut to use 'tycat' backend.
 Shortcut to use 'w3m' backend.
 .TP
 \fB\-\-off\fR
-Shortcut to use 'off' backend.
+Shortcut to use 'off' backend (Disable ascii art).
 .IP
 NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img',
 \&'/path/to/ascii', '/path/to/dir/'
@@ -261,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
@@ -302,19 +299,6 @@ closer to the left side.
 .TP
 \fB\-\-clean\fR
 Delete cached files and thumbnails.
-.SS "SCREENSHOT:"
-.TP
-\fB\-s\fR, \fB\-\-scrot\fR \fI\,/path/to/img\/\fP
-Take a screenshot, if path is left empty the screenshot function will use $scrot_dir and $scrot_name.
-.TP
-\fB\-su\fR, \fB\-\-upload\fR \fI\,/path/to/img\/\fP
-Same as \fB\-\-scrot\fR but uploads the scrot to a website.
-.TP
-\fB\-\-image_host\fR imgur/teknik
-Website to upload scrots to.
-.TP
-\fB\-\-scrot_cmd\fR cmd
-Screenshot program to launch
 .SS "OTHER:"
 .TP
 \fB\-\-config\fR \fI\,/path/to/config\/\fP
@@ -323,6 +307,9 @@ Specify a path to a custom config file
 \fB\-\-config\fR none
 Launch the script without a config file
 .TP
+\fB\-\-print_config\fR
+Print the default config file to stdout.
+.TP
 \fB\-\-stdout\fR
 Turn off all colors and disables any ASCII/image backend.
 .TP