Merge remote-tracking branch 'pullreq/pr/799'

This commit is contained in:
Muhammad Herdiansyah 2017-08-04 00:31:35 +07:00
commit c6c603066b
4 changed files with 31 additions and 4 deletions

View file

@ -8,6 +8,7 @@
- Config file now has a `.conf` suffix. - Config file now has a `.conf` suffix.
- Neofetch now assumes target directories (config file and ASCII directory) at install time, this fixes problems with systems such as NixOS. - Neofetch now assumes target directories (config file and ASCII directory) at install time, this fixes problems with systems such as NixOS.
- `stdout` mode is now reimplemented.
## Operating System ## Operating System

View file

@ -717,6 +717,12 @@ image_host="teknik"
# Misc Options # Misc Options
# Stdout mode
# Turn off all colors and disables image backend (ASCII/Image).
# Useful for piping into another command.
# Default: 'off'
# Values: 'on', 'off'
stdout="off"
# Config version. # Config version.
# #

View file

@ -2801,7 +2801,7 @@ prin() {
string="${subtitle_color}${bold}${string}" string="${subtitle_color}${bold}${string}"
# Print the info. # Print the info.
printf "%b\n" "${text_padding:+\033[${text_padding}C}${zws}${string}${reset} " printf "%b\n" "${text_padding:+\033[${text_padding}C}${zws}${string}${reset}"
# Calculate info height. # Calculate info height.
((++info_height)) ((++info_height))
@ -2813,7 +2813,7 @@ prin() {
get_underline() { get_underline() {
if [[ "$underline_enabled" == "on" ]]; then if [[ "$underline_enabled" == "on" ]]; then
printf -v underline "%${length}s" printf -v underline "%${length}s"
printf "%b\n" "${text_padding:+\033[${text_padding}C}${zws}${underline_color}${underline// /$underline_char}${reset} " printf "%b\n" "${text_padding:+\033[${text_padding}C}${zws}${underline_color}${underline// /$underline_char}${reset}"
unset -v length unset -v length
fi fi
prin=1 prin=1
@ -3636,6 +3636,20 @@ color() {
# OTHER # OTHER
stdout() {
image_backend="off"
unset subtitle_color
unset colon_color
unset info_color
unset underline_color
unset bold
unset title_color
unset at_color
unset text_padding
unset zws
unset reset
}
err() { err() {
err+="$(color 1)[!]\033[0m $1\n" err+="$(color 1)[!]\033[0m $1\n"
} }
@ -4184,6 +4198,7 @@ SCREENSHOT:
OTHER: OTHER:
--config /path/to/config Specify a path to a custom config file --config /path/to/config Specify a path to a custom config file
--config none Launch the script without a config file --config none Launch the script without a config file
--stdout Turn off all colors and disables any ASCII/image backend.
--help Print this text and exit --help Print this text and exit
--version Show neofetch version --version Show neofetch version
-v Display error messages. -v Display error messages.
@ -4401,6 +4416,7 @@ get_args() {
;; ;;
esac esac
;; ;;
"--stdout") stdout="on" ;;
"-v") verbose="on" ;; "-v") verbose="on" ;;
"-vv") set -x; verbose="on" ;; "-vv") set -x; verbose="on" ;;
"--help") usage ;; "--help") usage ;;
@ -4421,9 +4437,10 @@ main() {
get_distro get_distro
get_bold get_bold
get_distro_colors get_distro_colors
[[ "$stdout" == "on" ]] && stdout
# Minix doesn't support these sequences. # Minix doesn't support these sequences.
if [[ "$TERM" != "minix" ]]; then if [[ "$TERM" != "minix" && "$stdout" != "on" ]]; then
# If the script exits for any reason, unhide the cursor. # If the script exits for any reason, unhide the cursor.
trap 'printf "\033[?25h\033[?7h"' EXIT trap 'printf "\033[?25h\033[?7h"' EXIT

View file

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4. .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
.TH NEOFETCH "1" "July 2017" "Neofetch 3.2.1-git" "User Commands" .TH NEOFETCH "1" "August 2017" "Neofetch 3.2.1-git" "User Commands"
.SH NAME .SH NAME
Neofetch \- A fast, highly customizable system info script Neofetch \- A fast, highly customizable system info script
.SH SYNOPSIS .SH SYNOPSIS
@ -304,6 +304,9 @@ Specify a path to a custom config file
\fB\-\-config\fR none \fB\-\-config\fR none
Launch the script without a config file Launch the script without a config file
.TP .TP
\fB\-\-stdout\fR
Turn off all colors and disables any ASCII/image backend.
.TP
\fB\-\-help\fR \fB\-\-help\fR
Print this text and exit Print this text and exit
.TP .TP