# HG changeset patch # User Pascal Bellard # Date 1461224748 -7200 # Node ID 15e6c6910ee3715933c8cb8dc86d300ea41a6bd3 # Parent bbfe517fab08e032850202a63f0e322d487aeb2f Take care on root in post_install diff -r bbfe517fab08 -r 15e6c6910ee3 busybox/stuff/udhcp.script --- a/busybox/stuff/udhcp.script Thu Apr 21 00:25:41 2016 -0300 +++ b/busybox/stuff/udhcp.script Thu Apr 21 09:45:48 2016 +0200 @@ -16,6 +16,9 @@ logger "$0 interface=$interface ip=$ip broadcast=$broadcast subnet=$subnet router=$router domain=$domain dns=$dns $@" +skip=$(sed "/skipdhcpip=/!d;s/.*skipdhcpip=\([^ ]*\).*/\1/" /,// s|>[^<]*<|>Blinder<|' $i done - pgrep openbox >/dev/null && openbox --reconfigure + [ -z "$1" ] && pgrep openbox >/dev/null && openbox --reconfigure } pre_remove() { # Restore Openbox theme (SliTaz) - for i in /etc/xdg/openbox/rc.xml /home/*/.config/openbox/rc.xml; do + for i in $1/etc/xdg/openbox/rc.xml $1/home/*/.config/openbox/rc.xml; do [ -f $i ] && sed -i '//,// s|>[^<]*<|>SliTaz<|' $i done - pgrep openbox >/dev/null && openbox --reconfigure + [ -z "$1" ] && pgrep openbox >/dev/null && openbox --reconfigure } diff -r bbfe517fab08 -r 15e6c6910ee3 openbox-theme-chrommo/receipt --- a/openbox-theme-chrommo/receipt Thu Apr 21 00:25:41 2016 -0300 +++ b/openbox-theme-chrommo/receipt Thu Apr 21 09:45:48 2016 +0200 @@ -32,17 +32,17 @@ post_install() { # Set Openbox theme - for i in /etc/xdg/openbox/rc.xml /home/*/.config/openbox/rc.xml; do + for i in $1/etc/xdg/openbox/rc.xml $1/home/*/.config/openbox/rc.xml; do [ -f $i ] && sed -i '//,// s|>[^<]*<|>Chrommo<|' $i done - pgrep openbox >/dev/null && openbox --reconfigure + [ -z "$1" ] && pgrep openbox >/dev/null && openbox --reconfigure } pre_remove() { # Restore Openbox theme (SliTaz) - for i in /etc/xdg/openbox/rc.xml /home/*/.config/openbox/rc.xml; do + for i in $1/etc/xdg/openbox/rc.xml $1/home/*/.config/openbox/rc.xml; do [ -f $i ] && sed -i '//,// s|>[^<]*<|>SliTaz<|' $i done - pgrep openbox >/dev/null && openbox --reconfigure + [ -z "$1" ] && pgrep openbox >/dev/null && openbox --reconfigure } diff -r bbfe517fab08 -r 15e6c6910ee3 otf-transcends-games/receipt --- a/otf-transcends-games/receipt Thu Apr 21 00:25:41 2016 -0300 +++ b/otf-transcends-games/receipt Thu Apr 21 09:45:48 2016 +0200 @@ -31,5 +31,5 @@ post_install() { - fc-cache + chroot "$1/" /usr/bin/fc-cache } diff -r bbfe517fab08 -r 15e6c6910ee3 slitaz-backgrounds/receipt --- a/slitaz-backgrounds/receipt Thu Apr 21 00:25:41 2016 -0300 +++ b/slitaz-backgrounds/receipt Thu Apr 21 09:45:48 2016 +0200 @@ -27,5 +27,5 @@ post_install() { - rm -irf /usr/share/images/README.md + rm -irf $1/usr/share/images/README.md } diff -r bbfe517fab08 -r 15e6c6910ee3 ttf-bwahh/receipt --- a/ttf-bwahh/receipt Thu Apr 21 00:25:41 2016 -0300 +++ b/ttf-bwahh/receipt Thu Apr 21 09:45:48 2016 +0200 @@ -31,5 +31,5 @@ post_install() { - fc-cache + chroot "$1/" /usr/bin/fc-cache } diff -r bbfe517fab08 -r 15e6c6910ee3 ttf-warenhaus-typenhebel/receipt --- a/ttf-warenhaus-typenhebel/receipt Thu Apr 21 00:25:41 2016 -0300 +++ b/ttf-warenhaus-typenhebel/receipt Thu Apr 21 09:45:48 2016 +0200 @@ -31,5 +31,5 @@ post_install() { - fc-cache + chroot "$1/" /usr/bin/fc-cache } diff -r bbfe517fab08 -r 15e6c6910ee3 web-google-services/receipt --- a/web-google-services/receipt Thu Apr 21 00:25:41 2016 -0300 +++ b/web-google-services/receipt Thu Apr 21 09:45:48 2016 +0200 @@ -459,10 +459,10 @@ post_install() { - notify-send -u normal -t 5000 -i application-x-tazpkg "Tazpkg - Install" "The $PACKAGE is installed." + [ "$1" ] && notify-send -u normal -t 5000 -i application-x-tazpkg "Tazpkg - Install" "The $PACKAGE is installed." } post_remove() { - notify-send -u normal -t 5000 -i application-x-tazpkg "Tazpkg - Remove" "The $PACKAGE was removed." + [ "$1" ] && notify-send -u normal -t 5000 -i application-x-tazpkg "Tazpkg - Remove" "The $PACKAGE was removed." }