garuda-linux
/
garuda-common-settings
mirror of
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make loading starship in bashrc based on condition - remove starship from depends

This commit is contained in:
dr460nf1r3 2021-07-28 21:50:02 +02:00
parent ab24a7a36f
commit b23d714db9
No known key found for this signature in database
GPG Key ID: BE75B9D9767036C2
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PKGBUILD
View File

@ -2,8 +2,8 @@
# Maintainer: Librewish <librewish@gmail.com> # Maintainer: Librewish <librewish@gmail.com>
pkgname=garuda-common-settings pkgname=garuda-common-settings
pkgver=2.0.0 pkgver=2.0.1
pkgrel=2 pkgrel=1
arch=('any') arch=('any')
url="https://gitlab.com/garuda-linux/themes-and-settings/settings/$pkgname" url="https://gitlab.com/garuda-linux/themes-and-settings/settings/$pkgname"
license=('GPL') license=('GPL')
@ -14,7 +14,6 @@ depends=('btrfsmaintenance'
'garuda-browser-settings' 'garuda-browser-settings'
'garuda-hooks' 'garuda-hooks'
'garuda-icons' 'garuda-icons'
'garuda-starship-prompt'
'haveged' 'haveged'
'memavaild' 'memavaild'
'nohang' 'nohang'

26
etc/skel/.bashrc_garuda
View File

@ -1,19 +1,21 @@
# If not running interactively, don't do anything # If not running interactively, don't do anything
[[ $- != *i* ]] && return [[ $- != *i* ]] && return
# Load starship prompt # Load starship prompt if starship is installed
__main() { if [ -x /usr/bin/starship ]; then
local major="${BASH_VERSINFO[0]}" __main() {
local minor="${BASH_VERSINFO[1]}" local major="${BASH_VERSINFO[0]}"
local minor="${BASH_VERSINFO[1]}"
if ((major > 4)) || { ((major == 4)) && ((minor >= 1)); }; then if ((major > 4)) || { ((major == 4)) && ((minor >= 1)); }; then
source <("/usr/bin/starship" init bash --print-full-init) source <("/usr/bin/starship" init bash --print-full-init)
else else
source /dev/stdin <<<"$("/usr/bin/starship" init bash --print-full-init)" source /dev/stdin <<<"$("/usr/bin/starship" init bash --print-full-init)"
fi fi
} }
__main __main
unset -f __main unset -f __main
fi
# Aliases # Aliases
alias dir='dir --color=auto' alias dir='dir --color=auto'