wok rev 18707
fix some post_install status
line diff
1.1 --- a/awstats/receipt Wed Dec 16 15:01:11 2015 +0100 1.2 +++ b/awstats/receipt Wed Dec 16 15:49:50 2015 +0100 1.3 @@ -86,7 +86,7 @@ 1.4 /etc/init.d/lighttpd restart 1.5 fi 1.6 fi 1.7 - [ -z "$quiet" ] && cat <<EOT 1.8 + [ "$quiet" ] || cat <<EOT 1.9 1.10 You should add in your crontab something like; 1.11
2.1 --- a/boxbackup-client/receipt Wed Dec 16 15:01:11 2015 +0100 2.2 +++ b/boxbackup-client/receipt Wed Dec 16 15:49:50 2015 +0100 2.3 @@ -54,6 +54,7 @@ 2.4 /etc/init.d/bbackupd start 2.5 fi 2.6 fi 2.7 + true 2.8 } 2.9 2.10 # Pre and post remove commands for Tazpkg
3.1 --- a/firefox-dev/receipt Wed Dec 16 15:01:11 2015 +0100 3.2 +++ b/firefox-dev/receipt Wed Dec 16 15:49:50 2015 +0100 3.3 @@ -60,7 +60,7 @@ 3.4 usr/lib/firefox-devel- ; do 3.5 for j in $(ls -d $1/$i* 2>/dev/null); do 3.6 [ "${j##*-}" = "$VERSION" ] && continue 3.7 - [ -d $j ] && rm -rf $j 3.8 + [ ! -d $j ] || rm -rf $j 3.9 done 3.10 done 3.11 }
4.1 --- a/gcc/receipt Wed Dec 16 15:01:11 2015 +0100 4.2 +++ b/gcc/receipt Wed Dec 16 15:49:50 2015 +0100 4.3 @@ -121,10 +121,8 @@ 4.4 local root 4.5 root=$1 4.6 echo "Processing post-install commands..." 4.7 - if [ ! -f "$root/lib/cpp" ]; then 4.8 + [ -f "$root/lib/cpp" ] || 4.9 ln -s ../usr/bin/cpp $root/lib 4.10 - fi 4.11 - if [ ! -f "$root/usr/bin/cc" ]; then 4.12 + [ -f "$root/usr/bin/cc" ] || 4.13 ln -s gcc $root/usr/bin/cc 4.14 - fi 4.15 }
5.1 --- a/glpi/receipt Wed Dec 16 15:01:11 2015 +0100 5.2 +++ b/glpi/receipt Wed Dec 16 15:49:50 2015 +0100 5.3 @@ -130,6 +130,7 @@ 5.4 fi 5.5 5.6 fi 5.7 + true 5.8 } 5.9 5.10 post_remove()
6.1 --- a/jwm/receipt Wed Dec 16 15:01:11 2015 +0100 6.2 +++ b/jwm/receipt Wed Dec 16 15:49:50 2015 +0100 6.3 @@ -72,6 +72,7 @@ 6.4 sed -i "s/^sessions.*/sessions ${res},$PACKAGE/" $1/etc/slim.conf 6.5 status 6.6 fi 6.7 + true 6.8 } 6.9 6.10 post_remove()
7.1 --- a/kismet/receipt Wed Dec 16 15:01:11 2015 +0100 7.2 +++ b/kismet/receipt Wed Dec 16 15:49:50 2015 +0100 7.3 @@ -100,6 +100,7 @@ 7.4 echo "You MUST edit etc/kismet/kismet.conf and configure Kismet" 7.5 echo "for your system, or it will NOT run properly!" 7.6 fi 7.7 + true 7.8 } 7.9 7.10 post_remove()
8.1 --- a/libsdl/receipt Wed Dec 16 15:01:11 2015 +0100 8.2 +++ b/libsdl/receipt Wed Dec 16 15:49:50 2015 +0100 8.3 @@ -41,6 +41,5 @@ 8.4 8.5 post_install() 8.6 { 8.7 - [ -d "$1$INSTALLED/libSDL" ] && rm -rf "$1$INSTALLED/libSDL" 8.8 - : 8.9 + [ ! -d "$1$INSTALLED/libSDL" ] || rm -rf "$1$INSTALLED/libSDL" 8.10 }
9.1 --- a/linux-libre-api-headers/receipt Wed Dec 16 15:01:11 2015 +0100 9.2 +++ b/linux-libre-api-headers/receipt Wed Dec 16 15:49:50 2015 +0100 9.3 @@ -43,5 +43,6 @@ 9.4 post_install() 9.5 { 9.6 # Removed old linux-libre-headers 9.7 - rm -rf $1/var/lib/tazpkg/installed/linux-libre-headers 2>/dev/null 9.8 + [ ! -d $1/var/lib/tazpkg/installed/linux-libre-headers ] || 9.9 + rm -rf $1/var/lib/tazpkg/installed/linux-libre-headers 9.10 }
10.1 --- a/linux-libre/receipt Wed Dec 16 15:01:11 2015 +0100 10.2 +++ b/linux-libre/receipt Wed Dec 16 15:49:50 2015 +0100 10.3 @@ -194,5 +194,6 @@ 10.4 kernel /boot/vmlinuz-$VERSION-slitaz root=$root_dev 10.5 ---- 10.6 EOT 10.7 - fi 10.8 + fi 10.9 + true 10.10 }
11.1 --- a/linux/receipt Wed Dec 16 15:01:11 2015 +0100 11.2 +++ b/linux/receipt Wed Dec 16 15:49:50 2015 +0100 11.3 @@ -444,4 +444,5 @@ 11.4 ---- 11.5 EOT 11.6 fi 11.7 + true 11.8 }
12.1 --- a/nconf/receipt Wed Dec 16 15:01:11 2015 +0100 12.2 +++ b/nconf/receipt Wed Dec 16 15:49:50 2015 +0100 12.3 @@ -87,6 +87,7 @@ 12.4 mysql -u $db_user -p${db_password} -D $db < $sql_script ; status 12.5 fi 12.6 fi 12.7 + true 12.8 } 12.9 12.10 post_remove()
13.1 --- a/nginx-extras/receipt Wed Dec 16 15:01:11 2015 +0100 13.2 +++ b/nginx-extras/receipt Wed Dec 16 15:49:50 2015 +0100 13.3 @@ -102,4 +102,5 @@ 13.4 done 13.5 /etc/init.d/$PACKAGE start 13.6 fi 13.7 + true 13.8 }
14.1 --- a/nginx/receipt Wed Dec 16 15:01:11 2015 +0100 14.2 +++ b/nginx/receipt Wed Dec 16 15:49:50 2015 +0100 14.3 @@ -93,4 +93,5 @@ 14.4 done 14.5 /etc/init.d/$PACKAGE start 14.6 fi 14.7 + true 14.8 }
15.1 --- a/ocsreports/receipt Wed Dec 16 15:01:11 2015 +0100 15.2 +++ b/ocsreports/receipt Wed Dec 16 15:49:50 2015 +0100 15.3 @@ -84,6 +84,7 @@ 15.4 fi 15.5 15.6 fi 15.7 + true 15.8 } 15.9 15.10 post_remove()
16.1 --- a/php-auth-pam/receipt Wed Dec 16 15:01:11 2015 +0100 16.2 +++ b/php-auth-pam/receipt Wed Dec 16 15:49:50 2015 +0100 16.3 @@ -54,6 +54,7 @@ 16.4 apache apache/httpd.pid 16.5 lighttpd lighttpd.pid 16.6 EOT 16.7 + true 16.8 } 16.9 16.10 # Pre and post remove commands for Tazpkg.
17.1 --- a/python-django/receipt Wed Dec 16 15:01:11 2015 +0100 17.2 +++ b/python-django/receipt Wed Dec 16 15:49:50 2015 +0100 17.3 @@ -31,6 +31,7 @@ 17.4 # Remove old package. 17.5 post_install() 17.6 { 17.7 + [ ! -d $1/var/lib/tazpkg/installed/django ] || 17.8 rm -rf $1/var/lib/tazpkg/installed/django 17.9 } 17.10
18.1 --- a/python-docutils/receipt Wed Dec 16 15:01:11 2015 +0100 18.2 +++ b/python-docutils/receipt Wed Dec 16 15:49:50 2015 +0100 18.3 @@ -29,5 +29,6 @@ 18.4 # Remove old package. 18.5 post_install() 18.6 { 18.7 + [ ! -d $1/var/lib/tazpkg/installed/docutils ] || 18.8 rm -rf $1/var/lib/tazpkg/installed/docutils 18.9 }
19.1 --- a/python-jinja2/receipt Wed Dec 16 15:01:11 2015 +0100 19.2 +++ b/python-jinja2/receipt Wed Dec 16 15:49:50 2015 +0100 19.3 @@ -29,5 +29,6 @@ 19.4 # Remove old package. 19.5 post_install() 19.6 { 19.7 + [ ! -d $1/var/lib/tazpkg/installed/jinja2 ] || 19.8 rm -rf $1/var/lib/tazpkg/installed/jinja2 19.9 }
20.1 --- a/python-mysql/receipt Wed Dec 16 15:01:11 2015 +0100 20.2 +++ b/python-mysql/receipt Wed Dec 16 15:49:50 2015 +0100 20.3 @@ -32,8 +32,7 @@ 20.4 # Remove old package. 20.5 post_install() 20.6 { 20.7 - if [ -d $1/var/lib/tazpkg/installed/mysql-python ]; then 20.8 + [ ! -d $1/var/lib/tazpkg/installed/mysql-python ] || 20.9 rm -rf $1/var/lib/tazpkg/installed/mysql-python 20.10 - fi 20.11 } 20.12
21.1 --- a/python-numpy/receipt Wed Dec 16 15:01:11 2015 +0100 21.2 +++ b/python-numpy/receipt Wed Dec 16 15:49:50 2015 +0100 21.3 @@ -32,5 +32,6 @@ 21.4 # Remove old package. 21.5 post_install() 21.6 { 21.7 + [ ! -d $1/var/lib/tazpkg/installed/numpy ] || 21.8 rm -rf $1/var/lib/tazpkg/installed/numpy 21.9 }
22.1 --- a/python-pil/receipt Wed Dec 16 15:01:11 2015 +0100 22.2 +++ b/python-pil/receipt Wed Dec 16 15:49:50 2015 +0100 22.3 @@ -31,5 +31,6 @@ 22.4 # Remove old package. 22.5 post_install() 22.6 { 22.7 + [ ! -d $1/var/lib/tazpkg/installed/pil ] || 22.8 rm -rf $1/var/lib/tazpkg/installed/pil 22.9 }
23.1 --- a/python-pychart/receipt Wed Dec 16 15:01:11 2015 +0100 23.2 +++ b/python-pychart/receipt Wed Dec 16 15:49:50 2015 +0100 23.3 @@ -31,6 +31,7 @@ 23.4 # Remove old package. 23.5 post_install() 23.6 { 23.7 + [ ! -d $1/var/lib/tazpkg/installed/pychart ] || 23.8 rm -rf $1/var/lib/tazpkg/installed/pychart 23.9 } 23.10
24.1 --- a/python-pydot/receipt Wed Dec 16 15:01:11 2015 +0100 24.2 +++ b/python-pydot/receipt Wed Dec 16 15:49:50 2015 +0100 24.3 @@ -31,6 +31,7 @@ 24.4 # Remove old package. 24.5 post_install() 24.6 { 24.7 + [ ! -d $1/var/lib/tazpkg/installed/pydot ] || 24.8 rm -rf $1/var/lib/tazpkg/installed/pydot 24.9 } 24.10
25.1 --- a/python-pygame/receipt Wed Dec 16 15:01:11 2015 +0100 25.2 +++ b/python-pygame/receipt Wed Dec 16 15:49:50 2015 +0100 25.3 @@ -40,5 +40,6 @@ 25.4 # Remove old package. 25.5 post_install() 25.6 { 25.7 + [ ! -d $1/var/lib/tazpkg/installed/pygame/examples ] || 25.8 rm -rf $1/var/lib/tazpkg/installed/pygame/examples 25.9 }
26.1 --- a/python-pypdf/receipt Wed Dec 16 15:01:11 2015 +0100 26.2 +++ b/python-pypdf/receipt Wed Dec 16 15:49:50 2015 +0100 26.3 @@ -29,5 +29,6 @@ 26.4 # Remove old package. 26.5 post_install() 26.6 { 26.7 + [ ! -d $1/var/lib/tazpkg/installed/pypdf ] || 26.8 rm -rf $1/var/lib/tazpkg/installed/pypdf 26.9 }
27.1 --- a/python-pytz/receipt Wed Dec 16 15:01:11 2015 +0100 27.2 +++ b/python-pytz/receipt Wed Dec 16 15:49:50 2015 +0100 27.3 @@ -31,5 +31,6 @@ 27.4 # Remove old package. 27.5 post_install() 27.6 { 27.7 + [ ! -d $1/var/lib/tazpkg/installed/pytz ] || 27.8 rm -rf $1/var/lib/tazpkg/installed/pytz 27.9 }
28.1 --- a/python-reportlab/receipt Wed Dec 16 15:01:11 2015 +0100 28.2 +++ b/python-reportlab/receipt Wed Dec 16 15:49:50 2015 +0100 28.3 @@ -37,6 +37,7 @@ 28.4 # Remove old package. 28.5 post_install() 28.6 { 28.7 + [ ! -d $1/var/lib/tazpkg/installed/reportlab ] || 28.8 rm -rf $1/var/lib/tazpkg/installed/reportlab 28.9 } 28.10
29.1 --- a/python-simplejson/receipt Wed Dec 16 15:01:11 2015 +0100 29.2 +++ b/python-simplejson/receipt Wed Dec 16 15:49:50 2015 +0100 29.3 @@ -45,5 +45,6 @@ 29.4 # Remove old package. 29.5 post_install() 29.6 { 29.7 + [ ! -d $1/var/lib/tazpkg/installed/simplejson ] || 29.8 rm -rf $1/var/lib/tazpkg/installed/simplejson 29.9 }
30.1 --- a/python-sphinx/receipt Wed Dec 16 15:01:11 2015 +0100 30.2 +++ b/python-sphinx/receipt Wed Dec 16 15:49:50 2015 +0100 30.3 @@ -31,5 +31,6 @@ 30.4 # Remove old package. 30.5 post_install() 30.6 { 30.7 + [ ! -d $1/var/lib/tazpkg/installed/sphinx ] || 30.8 rm -rf $1/var/lib/tazpkg/installed/sphinx 30.9 }
31.1 --- a/raspberrypi-vc/receipt Wed Dec 16 15:01:11 2015 +0100 31.2 +++ b/raspberrypi-vc/receipt Wed Dec 16 15:49:50 2015 +0100 31.3 @@ -50,4 +50,5 @@ 31.4 EOT 31.5 status 31.6 fi 31.7 + true 31.8 }
32.1 --- a/razorqt/receipt Wed Dec 16 15:01:11 2015 +0100 32.2 +++ b/razorqt/receipt Wed Dec 16 15:49:50 2015 +0100 32.3 @@ -103,6 +103,7 @@ 32.4 sed -i "s/^sessions.*/sessions ${res},$PACKAGE/" $1/etc/slim.conf 32.5 status 32.6 fi 32.7 + true 32.8 } 32.9 32.10 post_remove()
33.1 --- a/util-linux-blkid/receipt Wed Dec 16 15:01:11 2015 +0100 33.2 +++ b/util-linux-blkid/receipt Wed Dec 16 15:49:50 2015 +0100 33.3 @@ -25,9 +25,8 @@ 33.4 # Remove old package 33.5 post_install() 33.6 { 33.7 - if [ -d "$INSTALLED/util-linux-ng-blkid" ]; then 33.8 + [ ! -d "$INSTALLED/util-linux-ng-blkid" ] || 33.9 rm -rf $INSTALLED/util-linux-ng-blkid 33.10 - fi 33.11 } 33.12 33.13 post_remove()