diff options
| author | jblum <jblum@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-10-03 05:27:52 +0000 |
|---|---|---|
| committer | jblum <jblum@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-10-03 05:27:52 +0000 |
| commit | da8b917e3393427c3556044915f5a4d1e5fba030 (patch) | |
| tree | 09155b7ed8135eed9dd11c293ddb525fb30d1b0f /grc/freedesktop | |
| parent | dfa8c9065b28729c342f0d345f506df63326a884 (diff) | |
verbose messages for freedesktop installer, added missing import for main window
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9705 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'grc/freedesktop')
| -rw-r--r-- | grc/freedesktop/Makefile.am | 2 | ||||
| -rw-r--r-- | grc/freedesktop/grc_setup_freedesktop.in | 14 |
2 files changed, 14 insertions, 2 deletions
diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am index 9595af88cc..3ec4ac5b2e 100644 --- a/grc/freedesktop/Makefile.am +++ b/grc/freedesktop/Makefile.am @@ -43,4 +43,4 @@ MOSTLYCLEANFILES = $(BUILT_SOURCES) install-data-hook: grc_setup_freedesktop grc_setup_freedesktop install uninstall-hook: grc_setup_freedesktop - sh grc_setup_freedesktop uninstall . + bash $(srcdir)/grc_setup_freedesktop uninstall $(srcdir) diff --git a/grc/freedesktop/grc_setup_freedesktop.in b/grc/freedesktop/grc_setup_freedesktop.in index b904ffff28..526cc27e44 100644 --- a/grc/freedesktop/grc_setup_freedesktop.in +++ b/grc/freedesktop/grc_setup_freedesktop.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash ################################################## # setup grc on a freedesktop platform # $1 should be install or uninstall @@ -16,26 +16,38 @@ fi case "$1" in 'install') + echo "Begin freedesktop install..." for size in ${ICON_SIZES}; do \ + echo "Install icon: ${size}x${size}" xdg-icon-resource install --context mimetypes --theme gnome --size ${size} ${SRCDIR}/grc-icon-${size}.png application-gnuradio-grc; \ xdg-icon-resource install --context mimetypes --size ${size} ${SRCDIR}/grc-icon-${size}.png application-gnuradio-grc; \ xdg-icon-resource install --context apps --theme gnome --size ${size} ${SRCDIR}/grc-icon-${size}.png gnuradio-grc; \ xdg-icon-resource install --context apps --size ${size} ${SRCDIR}/grc-icon-${size}.png gnuradio-grc; \ done + echo "Install mime type" xdg-mime install ${SRCDIR}/gnuradio-grc.xml + echo "Install menu items" xdg-desktop-menu install ${SRCDIR}/gnuradio-grc.desktop xdg-desktop-menu install ${SRCDIR}/gnuradio-usrp_diagnostics.desktop + echo "Done!" + echo "" ;; 'uninstall') + echo "Begin freedesktop uninstall..." for size in ${ICON_SIZES}; do \ + echo "Uninstall icon: ${size}x${size}" xdg-icon-resource uninstall --context mimetypes --theme gnome --size ${size} application-gnuradio-grc; \ xdg-icon-resource uninstall --context mimetypes --size ${size} application-gnuradio-grc; \ xdg-icon-resource uninstall --context apps --theme gnome --size ${size} gnuradio-grc; \ xdg-icon-resource uninstall --context apps --size ${size} gnuradio-grc; \ done + echo "Uninstall mime type" xdg-mime uninstall ${SRCDIR}/gnuradio-grc.xml + echo "Uninstall menu items" xdg-desktop-menu uninstall gnuradio-grc.desktop xdg-desktop-menu uninstall gnuradio-usrp_diagnostics.desktop + echo "Done!" + echo "" ;; *) echo "Usage: $0 [install|uninstall]" |