which -> command -v

command is builtin in most modern shells, which occasionally isn't
(e.g. Termux on older Android)

diff --git a/bin/pinentry b/bin/pinentry
index 16c214494109f7309783055786af6abc95695441..39349d58b9f26509a6eaad6dab622cf2f49eb25c 100755 (executable)
--- a/bin/pinentry
+++ b/bin/pinentry
@@ -11,7 +11,7 @@ case "${PINENTRY_USER_DATA-}" in
 esac
 
 for x in $list; do
 esac
 
 for x in $list; do

-       p=$(which "pinentry-$x")
+       p=$(command -v "pinentry-$x")

        if [ $? = 0 ]; then
                exec "$p" "$@"
        fi
        if [ $? = 0 ]; then
                exec "$p" "$@"
        fi

diff --git a/install.sh b/install.sh
index 5623d62d3a3e0f6f4117287444d915db86e66fee..2be365166bf5495bf90bdc7deb915cecd9302cf1 100755 (executable)
--- 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
 # 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
 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
         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
                   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 ] &&
                 [ "$(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
 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"
     mkdir -p "$DEST/etc/gnupg"
     find gnupg -mindepth 1 -maxdepth 1 \! -name '*.gpg' | while read -r x; do
         l "etc/$x"