triggers: Quote more defensively

In the unlikely event that one of these paths contains spaces or other special characters, we don't want to field splitting to take place. Signed-off-by: Simon McVittie <[email protected]>
flatpak · Jan 25, 2022 · 6fdc907 · 6fdc907
1 parent dc8227e
commit 6fdc907
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 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
- exec update-desktop-database -q $1/exports/share/applications
+if test \( -x "$(which update-desktop-database 2>/dev/null)" \) -a \( -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,10 +1,10 @@
 #!/bin/sh
 
-if test \( -x "$(which gtk-update-icon-cache 2>/dev/null)" \) -a \( -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
- if ! gtk-update-icon-cache --quiet $dir; then
+if test \( -x "$(which gtk-update-icon-cache 2>/dev/null)" \) -a \( -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
+ if ! gtk-update-icon-cache --quiet "$dir"; then
  echo "Failed to run gtk-update-icon-cache for $dir"
  exit 1
  fi

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
- exec update-mime-database $1/exports/share/mime
+if test \( -x "$(which update-mime-database 2>/dev/null)" \) -a \( -d "$1/exports/share/mime/packages" \); then
+ exec update-mime-database "$1/exports/share/mime"
 fi