wok diff nginx-extras/receipt @ rev 19010

busybox/fbvnc: wheelmouse support (again)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Mar 28 18:51:16 2016 +0200 (2016-03-28)
parents 9e01bc6321ea
children c83afd3687bf
line diff
     1.1 --- a/nginx-extras/receipt	Sun Dec 20 15:13:45 2015 +0100
     1.2 +++ b/nginx-extras/receipt	Mon Mar 28 18:51:16 2016 +0200
     1.3 @@ -20,9 +20,8 @@
     1.4  # Rules to configure and make the package.
     1.5  compile_rules()
     1.6  {
     1.7 -	cd $src
     1.8 -
     1.9 -	./configure --prefix=/usr \
    1.10 +	./configure \
    1.11 +		--prefix=/usr \
    1.12  		--conf-path=/etc/nginx/nginx.conf \
    1.13  		--pid-path=/var/run/nginx.pid \
    1.14  		--lock-path=/var/lock/nginx.lock \
    1.15 @@ -60,47 +59,49 @@
    1.16  	make &&
    1.17  	make DESTDIR=$DESTDIR install
    1.18  
    1.19 -		# not yet available - perftools dep lib
    1.20 -		#--with-google_perftools_module \
    1.21 +	# not yet available - perftools dep lib
    1.22 +	#--with-google_perftools_module \
    1.23  }
    1.24  
    1.25  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.26  # On SliTaz Lighttpd runs as user/group : www/www or 80/80.
    1.27  genpkg_rules()
    1.28  {
    1.29 -        cp -a $install/* $fs/
    1.30 -        rm -rf $fs/usr/html
    1.31 -        cp -a stuff/* $fs
    1.32 -        sed -i 's/#user  nobody;/user  www;/' $fs/etc/nginx/nginx.conf
    1.33 +	cp -a $install/* $fs/
    1.34 +	rm -rf $fs/usr/html
    1.35 +	cp -a stuff/* $fs
    1.36 +	sed -i 's/#user  nobody;/user  www;/' $fs/etc/nginx/nginx.conf
    1.37  }
    1.38  
    1.39  # Pre and post install commands for Tazpkg.
    1.40  # We stop the server by default in case of upgarde.
    1.41  pre_install()
    1.42  {
    1.43 -        echo "Processing pre-install commands..."
    1.44 -        [ -f /etc/init.d/$PACKAGE ] && /etc/init.d/$PACKAGE stop
    1.45 -        # Backup config file.
    1.46 -        if [ -d "$1/$CONFIG_FILES" ]; then
    1.47 +	[ -f /etc/init.d/$PACKAGE ] && /etc/init.d/$PACKAGE stop
    1.48 +	# Backup config file.
    1.49 +	if [ -d "$1/$CONFIG_FILES" ]; then
    1.50  		cp -a "$1/$CONFIG_FILES" "$1/$CONFIG_FILES.bak"
    1.51 -        fi
    1.52 +	fi
    1.53  }
    1.54 +
    1.55  post_install()
    1.56  {
    1.57 -        echo "Processing post-install commands..."
    1.58 -        mkdir -p /var/spool/nginx
    1.59 -        # Restore original config.
    1.60 -        if [ -d "$1/$CONFIG_FILES.bak" ]; then
    1.61 +	mkdir -p /var/spool/nginx
    1.62 +
    1.63 +	# Restore original config.
    1.64 +	if [ -d "$1/$CONFIG_FILES.bak" ]; then
    1.65  		rm -rf "$1/$CONFIG_FILES"
    1.66  		mv "$1/$CONFIG_FILES.bak" "$1/$CONFIG_FILES"
    1.67 -        fi
    1.68 -        # Just in case.
    1.69 -        chown www.www "$1/var/log/$PACKAGE"
    1.70 -        if [ -z "$1" ]; then
    1.71 -		for i in apache lighttpd ; do
    1.72 +	fi
    1.73 +
    1.74 +	# Just in case.
    1.75 +	chown www.www "$1/var/log/$PACKAGE"
    1.76 +	if [ -z "$1" ]; then
    1.77 +		for i in apache lighttpd; do
    1.78  			[ -f /etc/init.d/$i ] && /etc/init.d/$i stop
    1.79  		done
    1.80  		/etc/init.d/$PACKAGE start
    1.81 -        fi
    1.82 -        true
    1.83 +	fi
    1.84 +
    1.85 +	:
    1.86  }