# HG changeset patch # User Pascal Bellard # Date 1450277390 -3600 # Node ID 1067bb7f1e24948155ba1e3cd75fe7c20e4f1b45 # Parent c9b5496994f8929e09a888f72c2e809604ef4ddf fix some post_install status diff -r c9b5496994f8 -r 1067bb7f1e24 awstats/receipt --- a/awstats/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/awstats/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -86,7 +86,7 @@ /etc/init.d/lighttpd restart fi fi - [ -z "$quiet" ] && cat </dev/null); do [ "${j##*-}" = "$VERSION" ] && continue - [ -d $j ] && rm -rf $j + [ ! -d $j ] || rm -rf $j done done } diff -r c9b5496994f8 -r 1067bb7f1e24 gcc/receipt --- a/gcc/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/gcc/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -121,10 +121,8 @@ local root root=$1 echo "Processing post-install commands..." - if [ ! -f "$root/lib/cpp" ]; then + [ -f "$root/lib/cpp" ] || ln -s ../usr/bin/cpp $root/lib - fi - if [ ! -f "$root/usr/bin/cc" ]; then + [ -f "$root/usr/bin/cc" ] || ln -s gcc $root/usr/bin/cc - fi } diff -r c9b5496994f8 -r 1067bb7f1e24 glpi/receipt --- a/glpi/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/glpi/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -130,6 +130,7 @@ fi fi + true } post_remove() diff -r c9b5496994f8 -r 1067bb7f1e24 jwm/receipt --- a/jwm/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/jwm/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -72,6 +72,7 @@ sed -i "s/^sessions.*/sessions ${res},$PACKAGE/" $1/etc/slim.conf status fi + true } post_remove() diff -r c9b5496994f8 -r 1067bb7f1e24 kismet/receipt --- a/kismet/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/kismet/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -100,6 +100,7 @@ echo "You MUST edit etc/kismet/kismet.conf and configure Kismet" echo "for your system, or it will NOT run properly!" fi + true } post_remove() diff -r c9b5496994f8 -r 1067bb7f1e24 libsdl/receipt --- a/libsdl/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/libsdl/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -41,6 +41,5 @@ post_install() { - [ -d "$1$INSTALLED/libSDL" ] && rm -rf "$1$INSTALLED/libSDL" - : + [ ! -d "$1$INSTALLED/libSDL" ] || rm -rf "$1$INSTALLED/libSDL" } diff -r c9b5496994f8 -r 1067bb7f1e24 linux-libre-api-headers/receipt --- a/linux-libre-api-headers/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/linux-libre-api-headers/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -43,5 +43,6 @@ post_install() { # Removed old linux-libre-headers - rm -rf $1/var/lib/tazpkg/installed/linux-libre-headers 2>/dev/null + [ ! -d $1/var/lib/tazpkg/installed/linux-libre-headers ] || + rm -rf $1/var/lib/tazpkg/installed/linux-libre-headers } diff -r c9b5496994f8 -r 1067bb7f1e24 linux-libre/receipt --- a/linux-libre/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/linux-libre/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -194,5 +194,6 @@ kernel /boot/vmlinuz-$VERSION-slitaz root=$root_dev ---- EOT - fi + fi + true } diff -r c9b5496994f8 -r 1067bb7f1e24 linux/receipt --- a/linux/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/linux/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -444,4 +444,5 @@ ---- EOT fi + true } diff -r c9b5496994f8 -r 1067bb7f1e24 nconf/receipt --- a/nconf/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/nconf/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -87,6 +87,7 @@ mysql -u $db_user -p${db_password} -D $db < $sql_script ; status fi fi + true } post_remove() diff -r c9b5496994f8 -r 1067bb7f1e24 nginx-extras/receipt --- a/nginx-extras/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/nginx-extras/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -102,4 +102,5 @@ done /etc/init.d/$PACKAGE start fi + true } diff -r c9b5496994f8 -r 1067bb7f1e24 nginx/receipt --- a/nginx/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/nginx/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -93,4 +93,5 @@ done /etc/init.d/$PACKAGE start fi + true } diff -r c9b5496994f8 -r 1067bb7f1e24 ocsreports/receipt --- a/ocsreports/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/ocsreports/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -84,6 +84,7 @@ fi fi + true } post_remove() diff -r c9b5496994f8 -r 1067bb7f1e24 php-auth-pam/receipt --- a/php-auth-pam/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/php-auth-pam/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -54,6 +54,7 @@ apache apache/httpd.pid lighttpd lighttpd.pid EOT + true } # Pre and post remove commands for Tazpkg. diff -r c9b5496994f8 -r 1067bb7f1e24 python-django/receipt --- a/python-django/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/python-django/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -31,6 +31,7 @@ # Remove old package. post_install() { + [ ! -d $1/var/lib/tazpkg/installed/django ] || rm -rf $1/var/lib/tazpkg/installed/django } diff -r c9b5496994f8 -r 1067bb7f1e24 python-docutils/receipt --- a/python-docutils/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/python-docutils/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -29,5 +29,6 @@ # Remove old package. post_install() { + [ ! -d $1/var/lib/tazpkg/installed/docutils ] || rm -rf $1/var/lib/tazpkg/installed/docutils } diff -r c9b5496994f8 -r 1067bb7f1e24 python-jinja2/receipt --- a/python-jinja2/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/python-jinja2/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -29,5 +29,6 @@ # Remove old package. post_install() { + [ ! -d $1/var/lib/tazpkg/installed/jinja2 ] || rm -rf $1/var/lib/tazpkg/installed/jinja2 } diff -r c9b5496994f8 -r 1067bb7f1e24 python-mysql/receipt --- a/python-mysql/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/python-mysql/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -32,8 +32,7 @@ # Remove old package. post_install() { - if [ -d $1/var/lib/tazpkg/installed/mysql-python ]; then + [ ! -d $1/var/lib/tazpkg/installed/mysql-python ] || rm -rf $1/var/lib/tazpkg/installed/mysql-python - fi } diff -r c9b5496994f8 -r 1067bb7f1e24 python-numpy/receipt --- a/python-numpy/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/python-numpy/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -32,5 +32,6 @@ # Remove old package. post_install() { + [ ! -d $1/var/lib/tazpkg/installed/numpy ] || rm -rf $1/var/lib/tazpkg/installed/numpy } diff -r c9b5496994f8 -r 1067bb7f1e24 python-pil/receipt --- a/python-pil/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/python-pil/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -31,5 +31,6 @@ # Remove old package. post_install() { + [ ! -d $1/var/lib/tazpkg/installed/pil ] || rm -rf $1/var/lib/tazpkg/installed/pil } diff -r c9b5496994f8 -r 1067bb7f1e24 python-pychart/receipt --- a/python-pychart/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/python-pychart/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -31,6 +31,7 @@ # Remove old package. post_install() { + [ ! -d $1/var/lib/tazpkg/installed/pychart ] || rm -rf $1/var/lib/tazpkg/installed/pychart } diff -r c9b5496994f8 -r 1067bb7f1e24 python-pydot/receipt --- a/python-pydot/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/python-pydot/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -31,6 +31,7 @@ # Remove old package. post_install() { + [ ! -d $1/var/lib/tazpkg/installed/pydot ] || rm -rf $1/var/lib/tazpkg/installed/pydot } diff -r c9b5496994f8 -r 1067bb7f1e24 python-pygame/receipt --- a/python-pygame/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/python-pygame/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -40,5 +40,6 @@ # Remove old package. post_install() { + [ ! -d $1/var/lib/tazpkg/installed/pygame/examples ] || rm -rf $1/var/lib/tazpkg/installed/pygame/examples } diff -r c9b5496994f8 -r 1067bb7f1e24 python-pypdf/receipt --- a/python-pypdf/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/python-pypdf/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -29,5 +29,6 @@ # Remove old package. post_install() { + [ ! -d $1/var/lib/tazpkg/installed/pypdf ] || rm -rf $1/var/lib/tazpkg/installed/pypdf } diff -r c9b5496994f8 -r 1067bb7f1e24 python-pytz/receipt --- a/python-pytz/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/python-pytz/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -31,5 +31,6 @@ # Remove old package. post_install() { + [ ! -d $1/var/lib/tazpkg/installed/pytz ] || rm -rf $1/var/lib/tazpkg/installed/pytz } diff -r c9b5496994f8 -r 1067bb7f1e24 python-reportlab/receipt --- a/python-reportlab/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/python-reportlab/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -37,6 +37,7 @@ # Remove old package. post_install() { + [ ! -d $1/var/lib/tazpkg/installed/reportlab ] || rm -rf $1/var/lib/tazpkg/installed/reportlab } diff -r c9b5496994f8 -r 1067bb7f1e24 python-simplejson/receipt --- a/python-simplejson/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/python-simplejson/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -45,5 +45,6 @@ # Remove old package. post_install() { + [ ! -d $1/var/lib/tazpkg/installed/simplejson ] || rm -rf $1/var/lib/tazpkg/installed/simplejson } diff -r c9b5496994f8 -r 1067bb7f1e24 python-sphinx/receipt --- a/python-sphinx/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/python-sphinx/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -31,5 +31,6 @@ # Remove old package. post_install() { + [ ! -d $1/var/lib/tazpkg/installed/sphinx ] || rm -rf $1/var/lib/tazpkg/installed/sphinx } diff -r c9b5496994f8 -r 1067bb7f1e24 raspberrypi-vc/receipt --- a/raspberrypi-vc/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/raspberrypi-vc/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -50,4 +50,5 @@ EOT status fi + true } diff -r c9b5496994f8 -r 1067bb7f1e24 razorqt/receipt --- a/razorqt/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/razorqt/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -103,6 +103,7 @@ sed -i "s/^sessions.*/sessions ${res},$PACKAGE/" $1/etc/slim.conf status fi + true } post_remove() diff -r c9b5496994f8 -r 1067bb7f1e24 util-linux-blkid/receipt --- a/util-linux-blkid/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/util-linux-blkid/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -25,9 +25,8 @@ # Remove old package post_install() { - if [ -d "$INSTALLED/util-linux-ng-blkid" ]; then + [ ! -d "$INSTALLED/util-linux-ng-blkid" ] || rm -rf $INSTALLED/util-linux-ng-blkid - fi } post_remove() diff -r c9b5496994f8 -r 1067bb7f1e24 util-linux-uuid/receipt --- a/util-linux-uuid/receipt Wed Dec 16 15:01:11 2015 +0100 +++ b/util-linux-uuid/receipt Wed Dec 16 15:49:50 2015 +0100 @@ -31,4 +31,5 @@ echo "Removing old: util-linux-ng-uuid" rm -rf $1$INSTALLED/util-linux-ng-uuid fi + true }