triggers: Use command -v in preference to which

which(1) is not standardized by POSIX, and has different implementations and behaviour on different distributions. The behaviour and exit status of command -v is standardized by POSIX, and in particular, checking its exit status is an appropriate way to ask: if I called this command, would it be found? Signed-off-by: Simon McVittie <[email protected]>
flatpak · Jan 25, 2022 · bb307a5 · bb307a5
1 parent 6fdc907
commit bb307a5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/triggers/desktop-database.trigger b/triggers/desktop-database.trigger
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-if test \( -x "$(which update-desktop-database 2>/dev/null)" \) -a \( -d "$1/exports/share/applications" \); then
+if command -v update-desktop-database >/dev/null && test -d "$1/exports/share/applications"; then
  exec update-desktop-database -q "$1/exports/share/applications"
 fi
diff --git a/triggers/gtk-icon-cache.trigger b/triggers/gtk-icon-cache.trigger
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if test \( -x "$(which gtk-update-icon-cache 2>/dev/null)" \) -a \( -d "$1/exports/share/icons/hicolor" \); then
+if command -v gtk-update-icon-cache >/dev/null && test -d "$1/exports/share/icons/hicolor"; then
  cp /usr/share/icons/hicolor/index.theme "$1/exports/share/icons/hicolor/"
  for dir in "$1"/exports/share/icons/*; do
  if test -f "$dir/index.theme"; then

diff --git a/triggers/mime-database.trigger b/triggers/mime-database.trigger
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-if test \( -x "$(which update-mime-database 2>/dev/null)" \) -a \( -d "$1/exports/share/mime/packages" \); then
+if command -v update-mime-database >/dev/null && test -d "$1/exports/share/mime/packages"; then
  exec update-mime-database "$1/exports/share/mime"
 fi