From 5756eb97f266a8442689fe1d0029746b59f672c0 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Thu, 24 May 2018 12:46:47 +1000 Subject: [PATCH 1/6] song: fix iTunes detection --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index bd09a0b7..68b9e6aa 100755 --- a/neofetch +++ b/neofetch @@ -2328,7 +2328,7 @@ get_song() { -e "exaile" \ -e "gnome-music" \ -e "guayadeque" \ - -e "iTunes$" \ + -e "iTunes" \ -e "juk" \ -e "lollypop" \ -e "mocp" \ From 15c2939779aa1d4ba156a156300903336f004cea Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Thu, 24 May 2018 13:46:35 +1000 Subject: [PATCH 2/6] term_font: fix iTerm2 checking 2 more profiles than exists --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 68b9e6aa..be423c66 100755 --- a/neofetch +++ b/neofetch @@ -2800,9 +2800,9 @@ END font_file="${HOME}/Library/Preferences/com.googlecode.iterm2.plist" # Count Guids in "New Bookmarks"; they should be unique - profiles_count="$(PlistBuddy -c "Print :New\ Bookmarks:" "$font_file" | grep -c "Guid")" + profiles_count="$(PlistBuddy -c "Print :New\ Bookmarks:" "$font_file" | grep -w -c "Guid")" - for ((i=0; i<=profiles_count; i++)); do + for ((i=0; i Date: Thu, 24 May 2018 13:50:05 +1000 Subject: [PATCH 3/6] docs: update [skip ci] --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a630cf99..b75694cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - [ascii] Fixed a bug causing Windows 7 ASCII art to not display. - [image] Added new option to configure the resolution of `catimg`. +- [font] Fix iTerm2 checking for 2 extra profiles that don't exist. [**@iandrewt**](https://github.com/iandrewt") ## [4.0.2] - 2018-05-19 From 5143b20ce132ed26a3f4afd1d3dc36de8812e39e Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Thu, 24 May 2018 13:55:09 +1000 Subject: [PATCH 4/6] font: fix line length for iTerm2 profile count --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index be423c66..853e90af 100755 --- a/neofetch +++ b/neofetch @@ -2800,7 +2800,8 @@ END font_file="${HOME}/Library/Preferences/com.googlecode.iterm2.plist" # Count Guids in "New Bookmarks"; they should be unique - profiles_count="$(PlistBuddy -c "Print :New\ Bookmarks:" "$font_file" | grep -w -c "Guid")" + profiles_count="$(PlistBuddy -c "Print :New\ Bookmarks:" "$font_file" | \ + grep -w -c "Guid")" for ((i=0; i Date: Thu, 24 May 2018 14:27:39 +1000 Subject: [PATCH 5/6] Revert "term_font: fix iTerm2 checking 2 more profiles than exists" This reverts commit 15c2939779aa1d4ba156a156300903336f004cea. --- neofetch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 853e90af..68b9e6aa 100755 --- a/neofetch +++ b/neofetch @@ -2800,10 +2800,9 @@ END font_file="${HOME}/Library/Preferences/com.googlecode.iterm2.plist" # Count Guids in "New Bookmarks"; they should be unique - profiles_count="$(PlistBuddy -c "Print :New\ Bookmarks:" "$font_file" | \ - grep -w -c "Guid")" + profiles_count="$(PlistBuddy -c "Print :New\ Bookmarks:" "$font_file" | grep -c "Guid")" - for ((i=0; i Date: Thu, 24 May 2018 15:46:38 +1000 Subject: [PATCH 6/6] Revert "Revert "term_font: fix iTerm2 checking 2 more profiles than exists"" This reverts commit f49919e95773878709e2e0c52453d4321a31c521. --- neofetch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 68b9e6aa..853e90af 100755 --- a/neofetch +++ b/neofetch @@ -2800,9 +2800,10 @@ END font_file="${HOME}/Library/Preferences/com.googlecode.iterm2.plist" # Count Guids in "New Bookmarks"; they should be unique - profiles_count="$(PlistBuddy -c "Print :New\ Bookmarks:" "$font_file" | grep -c "Guid")" + profiles_count="$(PlistBuddy -c "Print :New\ Bookmarks:" "$font_file" | \ + grep -w -c "Guid")" - for ((i=0; i<=profiles_count; i++)); do + for ((i=0; i