wok-current rev 19065
Take care on root in post_install
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Apr 21 09:45:48 2016 +0200 (2016-04-21) |
parents | bbfe517fab08 |
children | 0fbf0b6f44e2 |
files | busybox/stuff/udhcp.script get-community-backgrounds/receipt get-slitaz-extra-themes/receipt openbox-theme-blinder/receipt openbox-theme-chrommo/receipt otf-transcends-games/receipt slitaz-backgrounds/receipt ttf-bwahh/receipt ttf-warenhaus-typenhebel/receipt web-google-services/receipt |
line diff
1.1 --- a/busybox/stuff/udhcp.script Thu Apr 21 00:25:41 2016 -0300 1.2 +++ b/busybox/stuff/udhcp.script Thu Apr 21 09:45:48 2016 +0200 1.3 @@ -16,6 +16,9 @@ 1.4 1.5 logger "$0 interface=$interface ip=$ip broadcast=$broadcast subnet=$subnet router=$router domain=$domain dns=$dns $@" 1.6 1.7 +skip=$(sed "/skipdhcpip=/!d;s/.*skipdhcpip=\([^ ]*\).*/\1/" </proc/cmdline) 1.8 +[ -n "$skip" ] && case "$ip" in $skip*) exit 0;; esac 1.9 + 1.10 case "$1" in 1.11 deconfig) 1.12 netfs || /sbin/ifconfig $interface 0.0.0.0
2.1 --- a/get-community-backgrounds/receipt Thu Apr 21 00:25:41 2016 -0300 2.2 +++ b/get-community-backgrounds/receipt Thu Apr 21 09:45:48 2016 +0200 2.3 @@ -17,5 +17,5 @@ 2.4 } 2.5 post_install() 2.6 { 2.7 - get-community-backgrounds 2.8 + [ "$1" ] || get-community-backgrounds 2.9 } 2.10 \ No newline at end of file
3.1 --- a/get-slitaz-extra-themes/receipt Thu Apr 21 00:25:41 2016 -0300 3.2 +++ b/get-slitaz-extra-themes/receipt Thu Apr 21 09:45:48 2016 +0200 3.3 @@ -17,5 +17,5 @@ 3.4 } 3.5 post_install() 3.6 { 3.7 - get-slitaz-extra-themes 3.8 + [ "$1" ] || get-slitaz-extra-themes 3.9 } 3.10 \ No newline at end of file
4.1 --- a/openbox-theme-blinder/receipt Thu Apr 21 00:25:41 2016 -0300 4.2 +++ b/openbox-theme-blinder/receipt Thu Apr 21 09:45:48 2016 +0200 4.3 @@ -31,17 +31,17 @@ 4.4 post_install() 4.5 { 4.6 # Set Openbox theme 4.7 - for i in /etc/xdg/openbox/rc.xml /home/*/.config/openbox/rc.xml; do 4.8 + for i in $1/etc/xdg/openbox/rc.xml $1/home/*/.config/openbox/rc.xml; do 4.9 [ -f $i ] && sed -i '/<theme>/,/<name>/ s|>[^<]*<|>Blinder<|' $i 4.10 done 4.11 - pgrep openbox >/dev/null && openbox --reconfigure 4.12 + [ -z "$1" ] && pgrep openbox >/dev/null && openbox --reconfigure 4.13 } 4.14 4.15 pre_remove() 4.16 { 4.17 # Restore Openbox theme (SliTaz) 4.18 - for i in /etc/xdg/openbox/rc.xml /home/*/.config/openbox/rc.xml; do 4.19 + for i in $1/etc/xdg/openbox/rc.xml $1/home/*/.config/openbox/rc.xml; do 4.20 [ -f $i ] && sed -i '/<theme>/,/<name>/ s|>[^<]*<|>SliTaz<|' $i 4.21 done 4.22 - pgrep openbox >/dev/null && openbox --reconfigure 4.23 + [ -z "$1" ] && pgrep openbox >/dev/null && openbox --reconfigure 4.24 }
5.1 --- a/openbox-theme-chrommo/receipt Thu Apr 21 00:25:41 2016 -0300 5.2 +++ b/openbox-theme-chrommo/receipt Thu Apr 21 09:45:48 2016 +0200 5.3 @@ -32,17 +32,17 @@ 5.4 post_install() 5.5 { 5.6 # Set Openbox theme 5.7 - for i in /etc/xdg/openbox/rc.xml /home/*/.config/openbox/rc.xml; do 5.8 + for i in $1/etc/xdg/openbox/rc.xml $1/home/*/.config/openbox/rc.xml; do 5.9 [ -f $i ] && sed -i '/<theme>/,/<name>/ s|>[^<]*<|>Chrommo<|' $i 5.10 done 5.11 - pgrep openbox >/dev/null && openbox --reconfigure 5.12 + [ -z "$1" ] && pgrep openbox >/dev/null && openbox --reconfigure 5.13 } 5.14 5.15 pre_remove() 5.16 { 5.17 # Restore Openbox theme (SliTaz) 5.18 - for i in /etc/xdg/openbox/rc.xml /home/*/.config/openbox/rc.xml; do 5.19 + for i in $1/etc/xdg/openbox/rc.xml $1/home/*/.config/openbox/rc.xml; do 5.20 [ -f $i ] && sed -i '/<theme>/,/<name>/ s|>[^<]*<|>SliTaz<|' $i 5.21 done 5.22 - pgrep openbox >/dev/null && openbox --reconfigure 5.23 + [ -z "$1" ] && pgrep openbox >/dev/null && openbox --reconfigure 5.24 }
6.1 --- a/otf-transcends-games/receipt Thu Apr 21 00:25:41 2016 -0300 6.2 +++ b/otf-transcends-games/receipt Thu Apr 21 09:45:48 2016 +0200 6.3 @@ -31,5 +31,5 @@ 6.4 6.5 post_install() 6.6 { 6.7 - fc-cache 6.8 + chroot "$1/" /usr/bin/fc-cache 6.9 }
7.1 --- a/slitaz-backgrounds/receipt Thu Apr 21 00:25:41 2016 -0300 7.2 +++ b/slitaz-backgrounds/receipt Thu Apr 21 09:45:48 2016 +0200 7.3 @@ -27,5 +27,5 @@ 7.4 7.5 post_install() 7.6 { 7.7 - rm -irf /usr/share/images/README.md 7.8 + rm -irf $1/usr/share/images/README.md 7.9 }
8.1 --- a/ttf-bwahh/receipt Thu Apr 21 00:25:41 2016 -0300 8.2 +++ b/ttf-bwahh/receipt Thu Apr 21 09:45:48 2016 +0200 8.3 @@ -31,5 +31,5 @@ 8.4 8.5 post_install() 8.6 { 8.7 - fc-cache 8.8 + chroot "$1/" /usr/bin/fc-cache 8.9 }
9.1 --- a/ttf-warenhaus-typenhebel/receipt Thu Apr 21 00:25:41 2016 -0300 9.2 +++ b/ttf-warenhaus-typenhebel/receipt Thu Apr 21 09:45:48 2016 +0200 9.3 @@ -31,5 +31,5 @@ 9.4 9.5 post_install() 9.6 { 9.7 - fc-cache 9.8 + chroot "$1/" /usr/bin/fc-cache 9.9 }
10.1 --- a/web-google-services/receipt Thu Apr 21 00:25:41 2016 -0300 10.2 +++ b/web-google-services/receipt Thu Apr 21 09:45:48 2016 +0200 10.3 @@ -459,10 +459,10 @@ 10.4 10.5 post_install() 10.6 { 10.7 - notify-send -u normal -t 5000 -i application-x-tazpkg "Tazpkg - Install" "The $PACKAGE is installed." 10.8 + [ "$1" ] && notify-send -u normal -t 5000 -i application-x-tazpkg "Tazpkg - Install" "The $PACKAGE is installed." 10.9 } 10.10 10.11 post_remove() 10.12 { 10.13 - notify-send -u normal -t 5000 -i application-x-tazpkg "Tazpkg - Remove" "The $PACKAGE was removed." 10.14 + [ "$1" ] && notify-send -u normal -t 5000 -i application-x-tazpkg "Tazpkg - Remove" "The $PACKAGE was removed." 10.15 }