# HG changeset patch # User Pascal Bellard # Date 1452874699 -3600 # Node ID 486dbfc17892dd38cb9be5d85bc6005fc7dccba5 # Parent 49be2e5503d01be3b3557970ad5f1175de2a8a57 lxpanel: fix post_install (again) diff -r 49be2e5503d0 -r 486dbfc17892 QtWeb/receipt --- a/QtWeb/receipt Fri Jan 15 16:27:43 2016 +0100 +++ b/QtWeb/receipt Fri Jan 15 17:18:19 2016 +0100 @@ -79,7 +79,7 @@ EOT for i in $(ls "$1/home" 2> /dev/null); do - [ -f "/home/$i/.config/QtWeb.NET/QtWeb Internet Browser.conf" ] && continue + [ -f "$1/home/$i/.config/QtWeb.NET/QtWeb Internet Browser.conf" ] && continue mkdir -p "$1/home/$i/.config/QtWeb.NET" cp "$1/tmp/QtWeb Internet Browser.conf" "$1/home/$i/.config/QtWeb.NET" chroot "$1/" chown -R $(stat -c "%u.%g" "$1/home/$i") "/home/$i/.config/QtWeb.NET" diff -r 49be2e5503d0 -r 486dbfc17892 busybox/receipt --- a/busybox/receipt Fri Jan 15 16:27:43 2016 +0100 +++ b/busybox/receipt Fri Jan 15 17:18:19 2016 +0100 @@ -180,7 +180,7 @@ pre_install() { local i - cp -a /etc/resolv.conf /etc/resolv.conf-busybox-install + cp -a $1/etc/resolv.conf $1/etc/resolv.conf-busybox-install answer="" for i in $(cat "$1$INSTALLED/$PACKAGE/files.list"); do [ -f "$1$i" ] || continue @@ -204,27 +204,27 @@ post_install() { local i - [ -f /etc/resolv.conf-busybox-install ] && - mv -f /etc/resolv.conf-busybox-install /etc/resolv.conf + [ -f $1/etc/resolv.conf-busybox-install ] && + mv -f $1/etc/resolv.conf-busybox-install $1/etc/resolv.conf while read i ; do [ -f "$1$i-busybox-install" ] || continue mv "$1$i-busybox-install" "$1$i" done < "$1$INSTALLED/$PACKAGE/files.list" chmod 4755 "$1/bin/busybox" - touch $root/etc/daemons.conf + touch $1/etc/daemons.conf # /etc/daemons.conf (tftp + dnsd + httpd may not be present) - if ! grep -q ^DNSD_OPTIONS $root/etc/daemons.conf; then - echo '# Domain name server options.' >> $root/etc/daemons.conf - echo 'DNSD_OPTIONS="-d"' >> $root/etc/daemons.conf - echo '' >> $root/etc/daemons.conf + if ! grep -q ^DNSD_OPTIONS $1/etc/daemons.conf; then + echo '# Domain name server options.' >> $1/etc/daemons.conf + echo 'DNSD_OPTIONS="-d"' >> $1/etc/daemons.conf + echo '' >> $1/etc/daemons.conf fi - if ! grep -q ^TFTPD_OPTIONS $root/etc/daemons.conf; then - echo '# Tftp daemon options.' >> $root/etc/daemons.conf - echo 'TFTPD_OPTIONS="-r /boot"' >> $root/etc/daemons.conf - echo '' >> $root/etc/daemons.conf + if ! grep -q ^TFTPD_OPTIONS $1/etc/daemons.conf; then + echo '# Tftp daemon options.' >> $1/etc/daemons.conf + echo 'TFTPD_OPTIONS="-r /boot"' >> $1/etc/daemons.conf + echo '' >> $1/etc/daemons.conf fi - sed -i "s/copy; 20../copy; $(date +%Y)/" $root/var/www/httpd/404.html + sed -i "s/copy; 20../copy; $(date +%Y)/" $1/var/www/httpd/404.html } pre_remove() diff -r 49be2e5503d0 -r 486dbfc17892 dooble/receipt --- a/dooble/receipt Fri Jan 15 16:27:43 2016 +0100 +++ b/dooble/receipt Fri Jan 15 17:18:19 2016 +0100 @@ -64,7 +64,7 @@ post_install() { for i in $(ls "$1/home" 2> /dev/null); do - [ -f "/home/$i/.dooble/Dooble/Dooble.ini" ] && continue + [ -f "$1/home/$i/.dooble/Dooble/Dooble.ini" ] && continue mkdir -p "$1/home/$i/.dooble/Dooble" cp "$1/usr/share/dooble/Dooble.ini" "$1/home/$i/.dooble/Dooble" rm "$1/home/$i/.local/share/applications/dooble.desktop" diff -r 49be2e5503d0 -r 486dbfc17892 gecko-mediaplayer/receipt --- a/gecko-mediaplayer/receipt Fri Jan 15 16:27:43 2016 +0100 +++ b/gecko-mediaplayer/receipt Fri Jan 15 17:18:19 2016 +0100 @@ -40,8 +40,8 @@ post_install() { - for i in "$1"/usr/lib/mozilla/plugins/$PACKAGE*.so ; do - ln -s "$i" "$1"/usr/lib/firefox*/plugins + for i in $(cd "$1"; ls usr/lib/mozilla/plugins/$PACKAGE*.so 2> /dev/null); do + ln -s "/$i" "$1"/usr/lib/firefox*/plugins done } diff -r 49be2e5503d0 -r 486dbfc17892 libQtGui/receipt --- a/libQtGui/receipt Fri Jan 15 16:27:43 2016 +0100 +++ b/libQtGui/receipt Fri Jan 15 17:18:19 2016 +0100 @@ -30,7 +30,7 @@ post_install() { for i in $(ls "$1/home" 2> /dev/null); do - [ -f "/home/$i/.config/Trolltech.conf" ] && continue + [ -f "$1/home/$i/.config/Trolltech.conf" ] && continue cp "$1/etc/skel/.config/Trolltech.conf" "$1/home/$i/.config" chroot "$1/" chown -R $(stat -c "%u.%g" "$1/home/$i") "/home/$i/.config" done diff -r 49be2e5503d0 -r 486dbfc17892 lxpanel/receipt --- a/lxpanel/receipt Fri Jan 15 16:27:43 2016 +0100 +++ b/lxpanel/receipt Fri Jan 15 17:18:19 2016 +0100 @@ -80,7 +80,5 @@ post_install() { # clean LXPanel menu caches - for i in $1/home/*/.cache/menus; do - [ -d "$i" ] && rm $i/* - done + chroot "$1/" rm home/*/.cache/menus/* 2> /dev/null }