From 8f5e2dfc53f909d8a922ac4c791e694154798f37 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sun, 19 Aug 2018 10:07:54 -0300 Subject: [PATCH] xbps-triggers: rename gtk-pixbuf-loaders to gdk-pixbuf-loaders It is the correct name, keep the old name as a scripts that execs itself into the new one for packages that still use gtk-pixbuf-loaders --- .../xbps-triggers/files/gdk-pixbuf-loaders | 51 +++++++++++++++++++ .../xbps-triggers/files/gtk-pixbuf-loaders | 51 ++----------------- srcpkgs/xbps-triggers/template | 2 +- 3 files changed, 55 insertions(+), 49 deletions(-) create mode 100755 srcpkgs/xbps-triggers/files/gdk-pixbuf-loaders diff --git a/srcpkgs/xbps-triggers/files/gdk-pixbuf-loaders b/srcpkgs/xbps-triggers/files/gdk-pixbuf-loaders new file mode 100755 index 00000000000..8520253d79d --- /dev/null +++ b/srcpkgs/xbps-triggers/files/gdk-pixbuf-loaders @@ -0,0 +1,51 @@ +#!/bin/sh +# +# Updates's GDK Pixbuf loaders cache with gdk-pixbuf-query-loaders(1). +# +# Arguments: $ACTION = [run/targets] +# $TARGET = [post-install/post-remove] +# $PKGNAME +# $VERSION +# $UPDATE = [yes/no] +# +ACTION="$1" +TARGET="$2" +PKGNAME="$3" +VERSION="$4" +UPDATE="$5" + +export PATH="$PATH:/usr/local/bin" + +pixbuf_bin=usr/bin/gdk-pixbuf-query-loaders +pixbuf_cache=usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache + +case "$ACTION" in +targets) + echo "post-install pre-remove post-remove" + ;; +run) + [ ! -x ${pixbuf_bin} ] && exit 0 + + if [ "$TARGET" = "pre-remove" -a "${PKGNAME}" = "gdk-pixbuf" ]; then + [ -f ${pixbuf_cache} ] && rm -f ${pixbuf_cache} + break + fi + case "$TARGET" in + post-*) + if [ -f etc/gtk-2.0/gdk-pixbuf.loaders ]; then + echo " Removing obsolete conf file: etc/gtk-2.0/gdk-pixbuf.loaders" + rm -f etc/gtk-2.0/gdk-pixbuf.loaders + fi + if [ -x ${pixbuf_bin} ]; then + echo "Updating GDK Pixbuf loaders cache..." + ${pixbuf_bin} --update-cache + fi + ;; + esac + ;; +*) + exit 1 + ;; +esac + +exit 0 diff --git a/srcpkgs/xbps-triggers/files/gtk-pixbuf-loaders b/srcpkgs/xbps-triggers/files/gtk-pixbuf-loaders index 8520253d79d..802b4898996 100755 --- a/srcpkgs/xbps-triggers/files/gtk-pixbuf-loaders +++ b/srcpkgs/xbps-triggers/files/gtk-pixbuf-loaders @@ -1,51 +1,6 @@ #!/bin/sh # -# Updates's GDK Pixbuf loaders cache with gdk-pixbuf-query-loaders(1). +# This trigger retains the old name of the current 'gdk-pixbuf-loaders' trigger +# and redirects all args there # -# Arguments: $ACTION = [run/targets] -# $TARGET = [post-install/post-remove] -# $PKGNAME -# $VERSION -# $UPDATE = [yes/no] -# -ACTION="$1" -TARGET="$2" -PKGNAME="$3" -VERSION="$4" -UPDATE="$5" - -export PATH="$PATH:/usr/local/bin" - -pixbuf_bin=usr/bin/gdk-pixbuf-query-loaders -pixbuf_cache=usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache - -case "$ACTION" in -targets) - echo "post-install pre-remove post-remove" - ;; -run) - [ ! -x ${pixbuf_bin} ] && exit 0 - - if [ "$TARGET" = "pre-remove" -a "${PKGNAME}" = "gdk-pixbuf" ]; then - [ -f ${pixbuf_cache} ] && rm -f ${pixbuf_cache} - break - fi - case "$TARGET" in - post-*) - if [ -f etc/gtk-2.0/gdk-pixbuf.loaders ]; then - echo " Removing obsolete conf file: etc/gtk-2.0/gdk-pixbuf.loaders" - rm -f etc/gtk-2.0/gdk-pixbuf.loaders - fi - if [ -x ${pixbuf_bin} ]; then - echo "Updating GDK Pixbuf loaders cache..." - ${pixbuf_bin} --update-cache - fi - ;; - esac - ;; -*) - exit 1 - ;; -esac - -exit 0 +exec usr/libexec/xbps-triggers/gdk-pixbuf-loaders "$@" diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template index 2ce9966d2e0..6b00b42f5d7 100644 --- a/srcpkgs/xbps-triggers/template +++ b/srcpkgs/xbps-triggers/template @@ -1,6 +1,6 @@ # Template file for 'xbps-triggers' pkgname=xbps-triggers -version=0.107 +version=0.108 revision=1 noarch=yes bootstrap=yes