From b47b41e373f124019d63a1611ee9799aae178592 Mon Sep 17 00:00:00 2001 From: EDIflyer Date: Sun, 19 Jun 2022 22:54:38 +0100 Subject: [PATCH 1/3] check fontcache is intalled --- install.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/install.sh b/install.sh index 8f2b51b..5a3d4de 100755 --- a/install.sh +++ b/install.sh @@ -7,6 +7,7 @@ FANCYGIT_RUNNING_OS=$(uname) FANCYGIT_GIT_PATH=$(whereis git | cut -d ":" -f 2) +FANCYGIT_FONTCONFIG_PATH=$(dpkg-query -l fontconfig 2>&1) #redirect STDERR to STDOUT to capture output errcho() { >&2 echo "$@"; @@ -19,6 +20,13 @@ if [ "" = "$FANCYGIT_GIT_PATH" ]; then exit 0 fi +if [ "dpkg-query: no packages found matching fontconfig" = "$FANCYGIT_FONTCONFIG_PATH" ]; then + errcho "" + errcho " ⚠ Please install fontconfig before running this command." + errcho "" + exit 0 +fi + git clone https://github.com/diogocavilha/fancy-git.git ~/.fancy-git if [ "Linux" = "$FANCYGIT_RUNNING_OS" ]; then From 6ef95cf37ac699c878f1dbbe3ca7fd728e32c465 Mon Sep 17 00:00:00 2001 From: EDIflyer Date: Sun, 19 Jun 2022 23:02:34 +0100 Subject: [PATCH 2/3] update version and changelog --- CHANGELOG.md | 3 +++ version.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4d6d6b..ca4ea62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ > Any trouble, please visit the [troubleshooting page](https://github.com/diogocavilha/fancy-git/blob/master/TROUBLESHOOTING.md) +## v7.1.8 +- Update installed to check fontconfig is installed prior to running script + ## v7.1.7 - Fix double line for default theme. diff --git a/version.sh b/version.sh index 6928be9..682b8ba 100644 --- a/version.sh +++ b/version.sh @@ -3,4 +3,4 @@ # Author: Diogo Alexsander Cavilha # Date: 11.17.2017 -export FANCYGIT_VERSION="7.1.7" +export FANCYGIT_VERSION="7.1.8" From c6d05df3aa3b16ac6b52cd242ac8429707f9e862 Mon Sep 17 00:00:00 2001 From: EDIflyer Date: Sun, 19 Jun 2022 23:41:25 +0100 Subject: [PATCH 3/3] tweak readme wording --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fb9ea1d..1987d7d 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ curl -sS https://raw.githubusercontent.com/diogocavilha/fancy-git/master/uninsta # :heavy_check_mark: After installing -1. Change your terminal font to one of these fonts: +1. Change the font *in your terminal application* to one of these fonts: - **Sauce-Code-Pro-Nerd-Font-Complete-Windows-Compatible.ttf**. - **DejaVu-Sans-Mono-Nerd-Font-Complete.ttf**. - **DejaVu-Sans-Mono-Nerd-Font-Complete-Mono.ttf**.