From b23d714db9aad234db96ac39c2b7216984df8ca4 Mon Sep 17 00:00:00 2001 From: dr460nf1r3 Date: Wed, 28 Jul 2021 21:50:02 +0200 Subject: [PATCH] Make loading starship in bashrc based on condition - remove starship from depends --- PKGBUILD | 5 ++--- etc/skel/.bashrc_garuda | 26 ++++++++++++++------------ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 2d074c1..24aff51 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer: Librewish pkgname=garuda-common-settings -pkgver=2.0.0 -pkgrel=2 +pkgver=2.0.1 +pkgrel=1 arch=('any') url="https://gitlab.com/garuda-linux/themes-and-settings/settings/$pkgname" license=('GPL') @@ -14,7 +14,6 @@ depends=('btrfsmaintenance' 'garuda-browser-settings' 'garuda-hooks' 'garuda-icons' - 'garuda-starship-prompt' 'haveged' 'memavaild' 'nohang' diff --git a/etc/skel/.bashrc_garuda b/etc/skel/.bashrc_garuda index 3b53090..33aa822 100644 --- a/etc/skel/.bashrc_garuda +++ b/etc/skel/.bashrc_garuda @@ -1,19 +1,21 @@ # If not running interactively, don't do anything [[ $- != *i* ]] && return -# Load starship prompt -__main() { - local major="${BASH_VERSINFO[0]}" - local minor="${BASH_VERSINFO[1]}" +# Load starship prompt if starship is installed +if [ -x /usr/bin/starship ]; then + __main() { + local major="${BASH_VERSINFO[0]}" + local minor="${BASH_VERSINFO[1]}" - if ((major > 4)) || { ((major == 4)) && ((minor >= 1)); }; then - source <("/usr/bin/starship" init bash --print-full-init) - else - source /dev/stdin <<<"$("/usr/bin/starship" init bash --print-full-init)" - fi -} -__main -unset -f __main + if ((major > 4)) || { ((major == 4)) && ((minor >= 1)); }; then + source <("/usr/bin/starship" init bash --print-full-init) + else + source /dev/stdin <<<"$("/usr/bin/starship" init bash --print-full-init)" + fi + } + __main + unset -f __main +fi # Aliases alias dir='dir --color=auto'