X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/blobdiff_plain/e4677c6bc5c3de5dc9092e4a7636d0587c5353c1..49c6c14fed5169940a4a0f0e37f2e2567358feb2:/install.sh diff --git a/install.sh b/install.sh index 5623d62..2be3651 100755 --- a/install.sh +++ b/install.sh @@ -25,7 +25,7 @@ fi # create preferred folder structure cd $DEST mkdir -p bin etc share/fonts share/themes share/icons >$devnull 2>&1 -which vim >$devnull 2>&1 && mkdir -pm 700 var/tmp/vim >$devnull 2>&1 +command -v vim >$devnull 2>&1 && mkdir -pm 700 var/tmp/vim >$devnull 2>&1 cd $SRC >$devnull # ensure ostype @@ -57,15 +57,15 @@ find gui -mindepth 1 -maxdepth 1 | while read -r y; do icons|themes) find "$y" -mindepth 1 -maxdepth 2 -type d | while read -r x; do [ ! -e "$x/index.theme" ] && continue - which gtk-update-icon-cache >$devnull 2>&1 && + command -v gtk-update-icon-cache >$devnull 2>&1 && gtk-update-icon-cache -f "$x" l "share${y#gui}/$(basename "$x")" done ;; fonts) find "$y" -mindepth 1 -maxdepth 2 -type d | while read -r x; do - which mkfontscale >$devnull 2>&1 && mkfontscale "$x" - which mkfontdir >$devnull 2>&1 && mkfontdir "$x" + command -v mkfontscale >$devnull 2>&1 && mkfontscale "$x" + command -v mkfontdir >$devnull 2>&1 && mkfontdir "$x" [ "$(head -1 "$x/fonts.scale" >$devnull 2>&1)" = 0 ] && rm "$x/fonts.scale" [ "$(head -1 "$x/fonts.dir" >$devnull 2>&1)" = 0 ] && @@ -82,7 +82,7 @@ find gui -mindepth 1 -maxdepth 1 | while read -r y; do done # gpg -if which gpg >$devnull 2>&1; then +if command -v gpg >$devnull 2>&1; then mkdir -p "$DEST/etc/gnupg" find gnupg -mindepth 1 -maxdepth 1 \! -name '*.gpg' | while read -r x; do l "etc/$x"