wok-next rev 18964

Up: ntpclient(2015_365); change output of some post_install()
author Aleksej Bobylev <al.bobylev@gmail.com>
date Thu Mar 10 02:23:56 2016 +0200 (2016-03-10)
parents 3b127f92c057
children 63cbc306c335
files krb5/receipt ntpclient/description.txt ntpclient/receipt pcmciautils/receipt slitaz-configs-base/receipt tazwikiss/receipt wireless_tools/receipt
line diff
     1.1 --- a/krb5/receipt	Wed Mar 09 19:55:45 2016 +0200
     1.2 +++ b/krb5/receipt	Thu Mar 10 02:23:56 2016 +0200
     1.3 @@ -54,9 +54,9 @@
     1.4  # Pre and post install commands for Tazpkg.
     1.5  post_install()
     1.6  {
     1.7 -	cat <<EOF
     1.8 +	[ -z "$quiet" ] && cat <<EOF
     1.9  ----
    1.10 -To start $PACKAGE server you can run :
    1.11 +To start $PACKAGE server you can run:
    1.12  
    1.13      /etc/init.d/$PACKAGE start
    1.14  
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/ntpclient/description.txt	Thu Mar 10 02:23:56 2016 +0200
     2.3 @@ -0,0 +1,5 @@
     2.4 +ntpclient is an NTP ([RFC-1305](http://www.ietf.org/rfc/rfc1305.txt)) client
     2.5 +for unix-alike computers. Its functionality is a small subset of [xntpd]
     2.6 +(http://www.eecis.udel.edu/~mills/ntp/), but IMHO performs better (or at least
     2.7 +has the potential to function better) within that limited scope. Since it is
     2.8 +much smaller than xntpd, it is also more relevant for embedded computers.
     3.1 --- a/ntpclient/receipt	Wed Mar 09 19:55:45 2016 +0200
     3.2 +++ b/ntpclient/receipt	Thu Mar 10 02:23:56 2016 +0200
     3.3 @@ -1,48 +1,45 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="ntpclient"
     3.7 -VERSION="2010_365"
     3.8 +VERSION="2015_365"
     3.9  CATEGORY="system-tools"
    3.10  SHORT_DESC="Tiny NTP Client"
    3.11  MAINTAINER="erjo@slitaz.org"
    3.12  LICENSE="GPL2"
    3.13 -TARBALL="${PACKAGE}_${VERSION}.tar.gz"
    3.14 -WEB_SITE="http://www.busybox.net/tinyutils.html"
    3.15 -WGET_URL="http://doolittle.icarus.com/ntpclient/$TARBALL"
    3.16 +TARBALL="${PACKAGE}_$VERSION.tar.gz"
    3.17 +WEB_SITE="http://doolittle.icarus.com/ntpclient/"
    3.18 +WGET_URL="${WEB_SITE}$TARBALL"
    3.19  HOST_ARCH="i486 arm"
    3.20  
    3.21  # Rules to configure and make the package.
    3.22  compile_rules()
    3.23  {
    3.24  	# disable debug
    3.25 -	sed -i 's/\(^CFLAGS += -DENABLE_DEBUG\)/#\1/' Makefile && 
    3.26 -	make 
    3.27 +	sed -i 's/\(^CFLAGS += -DENABLE_DEBUG\)/#\1/' Makefile &&
    3.28 +	make
    3.29  }
    3.30  
    3.31  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.32  genpkg_rules()
    3.33 -{	
    3.34 +{
    3.35  	mkdir -p $fs/usr/bin
    3.36  	cp -a $src/ntpclient  $fs/usr/bin
    3.37  }
    3.38  
    3.39  post_install()
    3.40  {
    3.41 -    [ -n "$1" ] && return
    3.42 -    echo ""
    3.43 -    echo -n "Do you want to run ntpclient in automatic mode (y/N): "; read -t 30 anser
    3.44 -    	if [ "$anser" == "y" ]; then
    3.45 -    		srv="fr.pool.ntp.org"
    3.46 -            echo ""
    3.47 -            echo -n "Setting up crontab for ntpclient..."
    3.48 -            crontab -l  2> /dev/null | grep -q '/usr/bin/ntpclient -s -h' || 
    3.49 -	    crontab - -u root << EOT
    3.50 -$(crontab -l 2> /dev/null)
    3.51 +	[ -n "$1" -o -n "$quiet" ] && return
    3.52 +	echo -en '\nDo you want to run ntpclient in automatic mode (y/N): '
    3.53 +	read -t 30 anser
    3.54 +		if [ "$anser" == 'y' ]; then
    3.55 +			srv='fr.pool.ntp.org'
    3.56 +			action 'Setting up crontab for ntpclient...'
    3.57 +			crontab -l  2>/dev/null | grep -q '/usr/bin/ntpclient -s -h' ||
    3.58 +			crontab - -u root <<EOT
    3.59 +$(crontab -l 2>/dev/null)
    3.60  0 0 * * * /usr/bin/ntpclient -s -h $srv
    3.61  EOT
    3.62 -            status
    3.63 -        else
    3.64 -        	echo "Don't forget to run ntpclient -s -h <NTP Server>"
    3.65 -        fi
    3.66 +		else
    3.67 +			echo "Don't forget to run ntpclient -s -h <NTP Server>"
    3.68 +		fi
    3.69  }
    3.70 -
     4.1 --- a/pcmciautils/receipt	Wed Mar 09 19:55:45 2016 +0200
     4.2 +++ b/pcmciautils/receipt	Thu Mar 10 02:23:56 2016 +0200
     4.3 @@ -40,5 +40,7 @@
     4.4  
     4.5  post_install()
     4.6  {
     4.7 +	echo
     4.8  	tazpkg reconfigure udev --root="$1"
     4.9 +	echo
    4.10  }
     5.1 --- a/slitaz-configs-base/receipt	Wed Mar 09 19:55:45 2016 +0200
     5.2 +++ b/slitaz-configs-base/receipt	Thu Mar 10 02:23:56 2016 +0200
     5.3 @@ -57,7 +57,7 @@
     5.4  
     5.5  post_install()
     5.6  {
     5.7 -	echo; echo -n "Updating ~/.xinitrc"
     5.8 +	[ -z "$quiet" ] && echo -en "\nUpdating ~/.xinitrc"
     5.9  	for i in $(ls -d "$1/root" "$1"/home/* 2> /dev/null); do
    5.10  		[ -d "$i" ] && cp -f "$1/etc/skel/.xinitrc" "$i"
    5.11  	done
     6.1 --- a/tazwikiss/receipt	Wed Mar 09 19:55:45 2016 +0200
     6.2 +++ b/tazwikiss/receipt	Thu Mar 10 02:23:56 2016 +0200
     6.3 @@ -17,7 +17,7 @@
     6.4  # Rules to configure and make the package.
     6.5  compile_rules()
     6.6  {
     6.7 -	mkdir -p $DESTDIR 2> /dev/null
     6.8 +	mkdir -p $DESTDIR 2>/dev/null
     6.9  	cp -a $src/$PACKAGE/rootfs/* $DESTDIR
    6.10  }
    6.11  
    6.12 @@ -93,6 +93,7 @@
    6.13  		grep -q ' httpd ' "$1/etc/rcS.conf" ||
    6.14  		sed -i 's/ slim"/ httpd slim"/' "$1/etc/rcS.conf"
    6.15  		if [ -z "$1" ]; then
    6.16 +			echo
    6.17  			# Start Web server.
    6.18  			/etc/init.d/httpd stop
    6.19  			/etc/init.d/httpd start
    6.20 @@ -100,7 +101,7 @@
    6.21  	fi
    6.22  	while read line; do
    6.23  		[ -x "$1/$line" ] && continue
    6.24 -		echo "WARNING: $line not found, $PACKAGE will not work !"
    6.25 +		echo "WARNING: $line not found, $PACKAGE will not work!"
    6.26  	done <<EOT
    6.27  /usr/sbin/httpd
    6.28  /usr/lib/slitaz/httphelper.sh
     7.1 --- a/wireless_tools/receipt	Wed Mar 09 19:55:45 2016 +0200
     7.2 +++ b/wireless_tools/receipt	Thu Mar 10 02:23:56 2016 +0200
     7.3 @@ -32,9 +32,12 @@
     7.4  
     7.5  post_install()
     7.6  {
     7.7 -	echo "You may need to install linux-wireless to have wireless network drivers."
     7.8 -	echo "Or install tazndis to use Windows drivers."
     7.9 +	[ -z "$quiet" ] && cat <<EOT
    7.10 +You may need to install linux-wireless to have wireless network drivers.
    7.11 +Or install tazndis to use Windows drivers.
    7.12 +EOT
    7.13  }
    7.14 +
    7.15  # Rules to clean extras dirs or files
    7.16  clean_wok()
    7.17  {