diff --git a/arch-packages/illogical-impulse-fonts-themes/PKGBUILD b/arch-packages/illogical-impulse-fonts-themes/PKGBUILD index abef79cb0..8c4e45e93 100644 --- a/arch-packages/illogical-impulse-fonts-themes/PKGBUILD +++ b/arch-packages/illogical-impulse-fonts-themes/PKGBUILD @@ -14,6 +14,7 @@ depends=( ttf-material-symbols-variable-git ttf-space-mono-nerd ttf-rubik-vf + ttf-gabarito-git fish foot starship diff --git a/install.sh b/install.sh index 02160a07d..439dc6648 100755 --- a/install.sh +++ b/install.sh @@ -167,14 +167,6 @@ v gsettings set org.gnome.desktop.interface font-name 'Rubik 11' printf "\e[36m[$0]: 2. Installing parts from source repo\e[0m\n" sleep 1 -if $(fc-list|grep -q Gabarito); then - echo -e "\e[33m[$0]: Font \"Gabarito\" already exists, no need to install.\e[0m" - echo -e "\e[34mYou can reinstall it in order to update to the latest version anyway.\e[0m" - ask_Gabarito=$ask -else ask_Gabarito=true -fi -if $ask_Gabarito;then showfun install-Gabarito;v install-Gabarito;fi - if $(test -d /usr/local/share/icons/OneUI); then echo -e "\e[33m[$0]: Icon pack \"OneUI\" already exists, no need to install.\e[0m" echo -e "\e[34mYou can reinstall it in order to update to the latest version anyway.\e[0m" @@ -292,8 +284,8 @@ warn_files=() warn_files_tests=() warn_files_tests+=(/usr/local/bin/ags) warn_files_tests+=(/usr/local/share/com.github.Aylur.ags) -warn_files_tests+=(/usr/local/share/fonts/TTF/Rubik[wght].ttf) -warn_files_tests+=(/usr/local/share/fonts/TTF/Rubik-Italic[wght].ttf) +warn_files_tests+=(/usr/local/share/fonts/TTF/Rubik{,-Italic}[wght].ttf) +warn_files_tests+=(/usr/local/share/fonts/TTF/Gabarito-{Black,Bold,ExtraBold,Medium,Regular,SemiBold}.ttf) for i in $warn_files_test; do test -f $t && warn_files+=($t) test -d $t && warn_files+=($t) diff --git a/scriptdata/installers b/scriptdata/installers index f686f9217..b8a76d7bd 100644 --- a/scriptdata/installers +++ b/scriptdata/installers @@ -51,6 +51,7 @@ install-Rubik (){ x cd $base } +# Not for Arch(based) distro. install-Gabarito (){ x mkdir -p $base/cache/Gabarito x cd $base/cache/Gabarito