Skip to content

Commit

Permalink
Merge pull request #121 from EDIflyer/check-for-fontconfig
Browse files Browse the repository at this point in the history
Amend installation script to check fontcache is installed
  • Loading branch information
diogocavilha authored Jun 19, 2022
2 parents c7d3481 + c6d05df commit 72a4c09
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 2 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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**.
Expand Down
8 changes: 8 additions & 0 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 "$@";
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
# Author: Diogo Alexsander Cavilha <[email protected]>
# Date: 11.17.2017

export FANCYGIT_VERSION="7.1.7"
export FANCYGIT_VERSION="7.1.8"

0 comments on commit 72a4c09

Please sign in to comment.