Changeset 2342

Timestamp:

Aug 29, 2016, 1:11:16 PM (3 years ago)

Author:

hectorgh

Message:

fixing prerms and diversions

Location:

lliurex-artwork-defaults/trunk/fuentes/debian

Files:

• lliurex-artwork-defaults-desktop.prerm (modified) (1 diff)
• lliurex-artwork-defaults-music.prerm (modified) (1 diff)

lliurex-artwork-defaults/trunk/fuentes/debian/lliurex-artwork-defaults-desktop.prerm

@@ -11 +11 @@
 
 
-        ORIGINAL_WHISKER_ES_FILE="/usr/share/locale/es/LC_MESSAGES/xfce4-whiskermenu-plugin.mo"
+        ORIGINAL_WHISKER_ES_FILE="/usr/share/locale/es/LC_MESSAGES/xfce4-whiskermenu-plugin.mo"
         NEW_DIVERTED_ES_FILE="/usr/share/locale/es/LC_MESSAGES/xfce4-whiskermenu-plugin.diverted"
+        LLIUREX_ES_FILE="/usr/share/lliurex-artwork-defaults/whiskermenu/locale/es/xfce4-whiskermenu-plugin.mo"
 
         ORIGINAL_WHISKER_CA_FILE="/usr/share/locale/ca/LC_MESSAGES/xfce4-whiskermenu-plugin.mo"
         NEW_DIVERTED_CA_FILE="/usr/share/locale/ca/LC_MESSAGES/xfce4-whiskermenu-plugin.diverted"
+        LLIUREX_CA_FILE="/usr/share/lliurex-artwork-defaults/whiskermenu/locale/ca/xfce4-whiskermenu-plugin.mo"
 
-        dpkg-divert --remove --package ${PKG} --rename --divert "$NEW_DIVERTED_ES_FILE" "$ORIGINAL_WHISKER_ES_FILE"
-        dpkg-divert --remove --package ${PKG} --rename --divert "$NEW_DIVERTED_CA_FILE" "$ORIGINAL_WHISKER_CA_FILE"
+        if [ -f "$NEW_DIVERTED_ES_FILE" ]; then
+                rm -rf $ORIGINAL_WHISKER_ES_FILE || true
+                dpkg-divert --remove --package ${PKG} --rename --divert "$NEW_DIVERTED_ES_FILE" "$ORIGINAL_WHISKER_ES_FILE"
+
+        fi
+
+        if [ -f "$NEW_DIVERTED_CA_FILE" ]; then
+
+                rm -rf $ORIGINAL_WHISKER_CA_FILE || true 
+                dpkg-divert --remove --package ${PKG} --rename --divert "$NEW_DIVERTED_CA_FILE" "$ORIGINAL_WHISKER_CA_FILE"
+
+        fi
 
         update-alternatives \

lliurex-artwork-defaults/trunk/fuentes/debian/lliurex-artwork-defaults-music.prerm

@@ -4 +4 @@
 
 
-if [ "$1" = remove ] ; then
+if [ "$1" = "remove" ] ; then
 
         update-alternatives \