From 5dfc59ee023c4089efef712b44514a754116a917 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Tue, 9 Feb 2016 14:50:35 +0100 Subject: [PATCH] Pass location of exports to triggers as arg1 This changes nothing but is a preparation for later changes --- common/xdg-app-dir.c | 1 + triggers/desktop-database.trigger | 4 ++-- triggers/gtk-icon-cache.trigger | 18 +++++++++--------- triggers/mime-database.trigger | 4 ++-- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/common/xdg-app-dir.c b/common/xdg-app-dir.c index 8d72bf14..1b1c29c4 100644 --- a/common/xdg-app-dir.c +++ b/common/xdg-app-dir.c @@ -1158,6 +1158,7 @@ xdg_app_dir_run_triggers (XdgAppDir *self, g_ptr_array_add (argv_array, g_strdup ("-F")); g_ptr_array_add (argv_array, g_strdup ("/usr")); g_ptr_array_add (argv_array, g_file_get_path (child)); + g_ptr_array_add (argv_array, g_strdup ("/app")); g_ptr_array_add (argv_array, NULL); if (!g_spawn_sync ("/", diff --git a/triggers/desktop-database.trigger b/triggers/desktop-database.trigger index ec89865a..2188f535 100755 --- 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 /app/exports/share/applications \); then - exec update-desktop-database -q /app/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 index 1afa2392..711cfab2 100755 --- a/triggers/gtk-icon-cache.trigger +++ b/triggers/gtk-icon-cache.trigger @@ -1,13 +1,13 @@ #!/bin/sh -if test \( -x "$(which gtk-update-icon-cache 2>/dev/null)" \) -a \( -d /app/exports/share/icons/hicolor \); then - cp /usr/share/icons/hicolor/index.theme /app/exports/share/icons/hicolor/ - for dir in /app/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 - fi +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 + fi done fi diff --git a/triggers/mime-database.trigger b/triggers/mime-database.trigger index f8edc17e..2067d8ec 100755 --- 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 /app/exports/share/mime/packages \); then - exec update-mime-database /app/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