From a6c5c64beabceec3992414f1ddbaf2d5711bef5f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 26 Jan 2017 17:51:36 +1100 Subject: [PATCH 1/2] General: Fix output if subtitles are disabled and prin is used --- movies.txt | 9 +++++++++ neofetch | 18 ++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 movies.txt diff --git a/movies.txt b/movies.txt new file mode 100644 index 00000000..412249de --- /dev/null +++ b/movies.txt @@ -0,0 +1,9 @@ +ascii +CHANGELOG.md +config +LICENSE.md +Makefile +movies.txt +neofetch +neofetch.1 +README.md diff --git a/neofetch b/neofetch index 1c23d061..f8bcd71f 100755 --- a/neofetch +++ b/neofetch @@ -1093,7 +1093,7 @@ get_gpu() { gpu="${gpu/Intel }" fi - prin "${subtitle}${gpu_num}" "$gpu" + prin "${subtitle:+${subtitle}${gpu_name}}" "$gpu" ((++gpu_num)) done @@ -1748,7 +1748,7 @@ get_disk() { esac # Append '(disk mount point)' to the subtitle. - prin "${subtitle} (${disk_sub})" "$disk" + prin "${subtitle:+${subtitle} (${disk_sub})}" "$disk" done } @@ -1774,7 +1774,7 @@ get_battery() { "barinfo") battery="$(bar "$capacity" 100) ${battery}" ;; esac - prin "${subtitle}${bat: -1}" "$battery" + prin "${subtitle:+${subtitle}${bat: -1}}" "$battery" done return ;; @@ -2519,7 +2519,7 @@ scrot_program() { info() { # Save subtitle value. - subtitle="$1" + [[ "$2" ]] && subtitle="$1" # Make sure that $prin is unset. unset -v prin @@ -2544,14 +2544,20 @@ info() { else err "Info: Couldn't detect ${1}." fi + + unset -v subtitle } prin() { # If $2 doesn't exist we format $1 as info. - [[ -z "$2" ]] && local subtitle_color="$info_color" + if [[ "$(trim "$1")" && "$2" ]]; then + string="${1//$'\033[0m'}${2:+: $2}" + else + string="${2:-$1}" + local subtitle_color="$info_color" + fi # Format the output. - string="${1//$'\033[0m'}${2:+: $2}" string="$(trim "$string")" string="${string/:/${reset}${colon_color}:${info_color}}" string="${subtitle_color}${bold}${string}" From e85133af65a1bd6733d3563766aa4d4a8a120025 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 26 Jan 2017 17:53:14 +1100 Subject: [PATCH 2/2] General: Fix output if subtitles are disabled and prin is used --- movies.txt | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 movies.txt diff --git a/movies.txt b/movies.txt deleted file mode 100644 index 412249de..00000000 --- a/movies.txt +++ /dev/null @@ -1,9 +0,0 @@ -ascii -CHANGELOG.md -config -LICENSE.md -Makefile -movies.txt -neofetch -neofetch.1 -README.md