wok diff zsh/receipt @ rev 24170

updated otf-gfs
author Hans-G?nter Theisgen
date Wed Dec 29 07:55:54 2021 +0100 (2021-12-29)
parents beba30c03091
children 922f061231c2
line diff
     1.1 --- a/zsh/receipt	Thu Mar 28 10:36:56 2019 +0100
     1.2 +++ b/zsh/receipt	Wed Dec 29 07:55:54 2021 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="zsh"
     1.7 -VERSION="5.7.1"
     1.8 +VERSION="5.8"
     1.9  CATEGORY="system-tools"
    1.10  TAGS="shell"
    1.11  SHORT_DESC="Zsh shell incorporates many features of bash, ksh, and tcsh."
    1.12 @@ -33,17 +33,18 @@
    1.13  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.14  genpkg_rules()
    1.15  {
    1.16 -	cp -a $install/bin $fs
    1.17 +	mkdir $fs/etc
    1.18 +	mkdir -p $fs/usr/share/zsh
    1.19 +	mkdir -p $fs/usr/share/zsh/scripts
    1.20 +
    1.21 +	cp -a $install/bin	$fs
    1.22  
    1.23  	# Configuration files.
    1.24 -	mkdir $fs/etc
    1.25  	cp $stuff/example.zshrc $fs/etc/zshrc
    1.26  
    1.27  	#no way around this... gen_package will not automatically copy these
    1.28 -	mkdir -p $fs/usr/share/zsh
    1.29 -	cp -r $install/usr/share/zsh/functions $fs/usr/share/zsh
    1.30 -
    1.31 -	mkdir -p $fs/usr/share/zsh/scripts
    1.32 +	cp -r $install/usr/share/zsh/functions \
    1.33 +				$fs/usr/share/zsh
    1.34  }
    1.35  
    1.36  # Post install commands for Tazpkg.
    1.37 @@ -52,18 +53,20 @@
    1.38  post_install()
    1.39  {
    1.40  	sh=$(readlink "$1/bin/sh")
    1.41 -	if [ "$sh" != '/bin/zsh' ]; then
    1.42 +	if [ "$sh" != '/bin/zsh' ]
    1.43 +	  then
    1.44  		echo ''
    1.45  		echo "**** Actual SH link : $sh"
    1.46  		echo ''
    1.47  		echo -n 'Do you want Zsh for /bin/sh (y/N) ? : '
    1.48  		read -t 30 answer < /dev/tty
    1.49 -		if [ "$answer" = 'y' ]; then
    1.50 +		if [ "$answer" = 'y' ]
    1.51 +		  then
    1.52  			echo ''
    1.53  			action 'Removing sh link to make a new one pointing on /bin/zsh...'
    1.54  			rm "$1/bin/sh" && ln -s /bin/zsh "$1/bin/sh"
    1.55  			status
    1.56 -		else
    1.57 +		  else
    1.58  			echo ''
    1.59  			echo "Leaving /bin/sh to : $sh"
    1.60  		fi
    1.61 @@ -74,5 +77,6 @@
    1.62  pre_remove()
    1.63  {
    1.64  	sh=$(readlink "$1/bin/sh")
    1.65 -	[ "$sh" != 'busybox' ] && ln -sf /bin/busybox "$1/bin/sh"
    1.66 +	[ "$sh" != 'busybox' ] &&
    1.67 +	ln -sf /bin/busybox "$1/bin/sh"
    1.68  }