Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=39c149deeb59f1d31d497fa91cdd8eae9ba05943
commit 39c149deeb59f1d31d497fa91cdd8eae9ba05943 Author: bouleetbil <bouleet...@frogdev.info> Date: Fri Oct 1 13:21:16 2010 +0200 gnome-scriptlet only one directory for register glib schemas diff --git a/source/include/gnome-scriptlet.install b/source/include/gnome-scriptlet.install index 2fcdb0b..5020fbe 100644 --- a/source/include/gnome-scriptlet.install +++ b/source/include/gnome-scriptlet.install @@ -1,6 +1,5 @@ schemas=($_F_gnome_schemas) entries=($_F_gnome_entries) -glib=($_F_gnome_glib) post_install() { @@ -25,14 +24,11 @@ post_install() fi echo "done." fi - if [ ${#glib[*]} -gt 0 ]; then + if [ -n "$_F_gnome_glib" ]; then echo -n "loading schema glib entries... " - for entry in "${gl...@]}" ; do - glib-compile-schemas $glib /dev/null 2>&1 - done + glib-compile-schemas /usr/share/glib-2.0/schemas echo "done." fi - if [ -n "$_F_gnome_desktop" ]; then echo -n "updating desktop database..." if update-desktop-database > /dev/null 2>&1 ; then @@ -73,14 +69,11 @@ post_upgrade() } pre_remove() { - if [ ${#glib[*]} -gt 0 ]; then + if [ -n "$_F_gnome_glib" ]; then echo -n "loading schema glib entries... " - for entry in "${gl...@]}" ; do - glib-compile-schemas $glib /dev/null 2>&1 - done + glib-compile-schemas /usr/share/glib-2.0/schemas echo "done." fi - if [ ${#schemas[*]} -gt 0 ]; then echo -n "updating gconf schemas... " for schema in "${schem...@]}" ; do diff --git a/source/include/gnome-scriptlet.sh b/source/include/gnome-scriptlet.sh index 908342b..0a89d54 100644 --- a/source/include/gnome-scriptlet.sh +++ b/source/include/gnome-scriptlet.sh @@ -36,7 +36,7 @@ # # == OPTIONS # * _F_gnome_schemas() - if declared, gconf will be called to register them -# * _F_gnome_glib() - if declared, glib2 will be called to register them +# * _F_gnome_glib() - set to "y" for register schemas glib into /usr/share/glib-2.0/schemas # * _F_gnome_entries() - same as above except for gconf .entries files # * _F_gnome_desktop - set to "y" if your package provides a .desktop file # * _F_gnome_scrollkeeper - set to "y" if you want to run rarian @@ -120,17 +120,7 @@ Fbuild_gnome_scriptlet() done fi Fsed '$_F_gnome_entries' "$str" ${Fsrcdir%/src}/$_F_gnome_scriptlet - if [ -n "$_F_gnome_glib" ]; then - for i in "${_f_gnome_gl...@]}" - do - if [ -z "$str" ]; then - str="'$i'\n" - else - str="$str\t'$i'\n" - fi - done - fi - Fsed '$_F_gnome_glib' "$str" ${Fsrcdir%/src}/$_F_gnome_scriptlet + Fsed '$_F_gnome_glib' "$_F_gnome_glib" ${Fsrcdir%/src}/$_F_gnome_scriptlet Fsed '$_F_gnome_desktop' "$_F_gnome_desktop" ${Fsrcdir%/src}/$_F_gnome_scriptlet Fsed '$_F_gnome_scrollkeeper' "$_F_gnome_scrollkeeper" ${Fsrcdir%/src}/$_F_gnome_scriptlet Fsed '$_F_gnome_mime' "$_F_gnome_mime" ${Fsrcdir%/src}/$_F_gnome_scriptlet _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git