Changeset 2345

Timestamp:

Aug 29, 2016, 1:39:26 PM (3 years ago)

Author:

hectorgh

Message:

fixing divert

Location:

lliurex-artwork-defaults/trunk/fuentes/debian

Files:

• lliurex-artwork-defaults-common.postinst (modified) (2 diffs)
• lliurex-artwork-defaults-common.prerm (modified) (1 diff)

lliurex-artwork-defaults/trunk/fuentes/debian/lliurex-artwork-defaults-common.postinst

@@ -18 +18 @@
         LLIUREX_CA_FILE="/usr/share/lliurex-artwork-defaults/whiskermenu/locale/ca/xfce4-whiskermenu-plugin.mo"
 
-        if [ ! -f "$NEW_DIVERTED_ES_FILE" ]; then
+        if [ ! -L "$ORIGINAL_WHISKER_ES_FILE" ]; then
 
                 dpkg-divert --add --package ${PKG} --rename --divert "$NEW_DIVERTED_ES_FILE" "$ORIGINAL_WHISKER_ES_FILE"
@@ -25 +25 @@
         fi
 
-        if [ ! -f "$NEW_DIVERTED_CA_FILE" ]; then
+        if [ ! -f "$ORIGINAL_WHISKER_CA_FILE" ]; then
 
                 dpkg-divert --add --package ${PKG} --rename --divert "$NEW_DIVERTED_CA_FILE" "$ORIGINAL_WHISKER_CA_FILE"

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

@@ -15 +15 @@
         LLIUREX_CA_FILE="/usr/share/lliurex-artwork-defaults/whiskermenu/locale/ca/xfce4-whiskermenu-plugin.mo"
 
-        if [ -f "$NEW_DIVERTED_ES_FILE" ]; then
-                rm -rf $ORIGINAL_WHISKER_ES_FILE || true
+        if [ -L "$ORIGINAL_WHISKER_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
+        if [ -L "$ORIGINAL_WHISKER_CA_FILE" ]; then
 
-                rm -rf $ORIGINAL_WHISKER_CA_FILE || true 
+                rm -rf "$ORIGINAL_WHISKER_CA_FILE" || true 
                 dpkg-divert --remove --package ${PKG} --rename --divert "$NEW_DIVERTED_CA_FILE" "$ORIGINAL_WHISKER_CA_FILE"