Changeset 2345


Ignore:
Timestamp:
Aug 29, 2016, 1:39:26 PM (3 years ago)
Author:
hectorgh
Message:

fixing divert

Location:
lliurex-artwork-defaults/trunk/fuentes/debian
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lliurex-artwork-defaults/trunk/fuentes/debian/lliurex-artwork-defaults-common.postinst

    r2344 r2345  
    1818        LLIUREX_CA_FILE="/usr/share/lliurex-artwork-defaults/whiskermenu/locale/ca/xfce4-whiskermenu-plugin.mo"
    1919
    20         if [ ! -f "$NEW_DIVERTED_ES_FILE" ]; then
     20        if [ ! -L "$ORIGINAL_WHISKER_ES_FILE" ]; then
    2121
    2222                dpkg-divert --add --package ${PKG} --rename --divert "$NEW_DIVERTED_ES_FILE" "$ORIGINAL_WHISKER_ES_FILE"
     
    2525        fi
    2626
    27         if [ ! -f "$NEW_DIVERTED_CA_FILE" ]; then
     27        if [ ! -f "$ORIGINAL_WHISKER_CA_FILE" ]; then
    2828
    2929                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

    r2344 r2345  
    1515        LLIUREX_CA_FILE="/usr/share/lliurex-artwork-defaults/whiskermenu/locale/ca/xfce4-whiskermenu-plugin.mo"
    1616
    17         if [ -f "$NEW_DIVERTED_ES_FILE" ]; then
    18                 rm -rf $ORIGINAL_WHISKER_ES_FILE || true
     17        if [ -L "$ORIGINAL_WHISKER_ES_FILE" ]; then
     18                rm -rf "$ORIGINAL_WHISKER_ES_FILE" || true
    1919                dpkg-divert --remove --package ${PKG} --rename --divert "$NEW_DIVERTED_ES_FILE" "$ORIGINAL_WHISKER_ES_FILE"
    2020
    2121        fi
    2222
    23         if [ -f "$NEW_DIVERTED_CA_FILE" ]; then
     23        if [ -L "$ORIGINAL_WHISKER_CA_FILE" ]; then
    2424
    25                 rm -rf $ORIGINAL_WHISKER_CA_FILE || true
     25                rm -rf "$ORIGINAL_WHISKER_CA_FILE" || true
    2626                dpkg-divert --remove --package ${PKG} --rename --divert "$NEW_DIVERTED_CA_FILE" "$ORIGINAL_WHISKER_CA_FILE"
    2727
Note: See TracChangeset for help on using the changeset viewer.