SliTaz Repositories

     1.1 --- a/vim-tiny/receipt	Sun Dec 20 15:13:45 2015 +0100
     1.2 +++ b/vim-tiny/receipt	Tue Apr 04 19:53:27 2017 +0000
     1.3 @@ -24,20 +24,20 @@
     1.4  	# define the place for the global vimrc file (set to /etc/vim/vimrc)
     1.5  	# (patch from Arch Linux PKGBUILD)
     1.6  	sed -i 's|^.*\(#define SYS_VIMRC_FILE\).*$|\1 "/etc/vim/vimrc"|' $src/src/feature.h
     1.7 -	
     1.8 +
     1.9  	./configure --prefix=/usr \
    1.10 -	 --cache-file=$PWD/config.cache \
    1.11 -	 --infodir=/usr/share/info \
    1.12 -	 --with-features=tiny \
    1.13 -	 --with-x=no \
    1.14 -	 --disable-gui \
    1.15 -         --enable-multibyte \
    1.16 -	 --with-vim-name=$PACKAGE \
    1.17 -	 --disable-acl \
    1.18 -	 --disable-motif-check \
    1.19 -	 --disable-athena-check \
    1.20 -	 --mandir=/usr/share/man $CONFIGURE_ARGS && 
    1.21 -	 
    1.22 +		--cache-file=$PWD/config.cache \
    1.23 +		--infodir=/usr/share/info \
    1.24 +		--with-features=tiny \
    1.25 +		--with-x=no \
    1.26 +		--disable-gui \
    1.27 +		--enable-multibyte \
    1.28 +		--with-vim-name=$PACKAGE \
    1.29 +		--disable-acl \
    1.30 +		--disable-motif-check \
    1.31 +		--disable-athena-check \
    1.32 +		--mandir=/usr/share/man $CONFIGURE_ARGS &&
    1.33 +
    1.34  	make VIMRCLOC=/etc/vim VIMRUNTIMEDIR=/usr/share/vim/vim73 MAKE="make -e" &&
    1.35  	make DESTDIR=$DESTDIR install
    1.36  	mkdir -p $DESTDIR/etc/vim
    1.37 @@ -48,7 +48,7 @@
    1.38  genpkg_rules()
    1.39  {
    1.40  	mkdir -p $fs/usr/share $fs/etc
    1.41 -	
    1.42 +
    1.43  	cp -a $install/usr/bin $fs/usr
    1.44  	cp -a $install/usr/share/vim $fs/usr/share
    1.45  	cp -a $install/etc/vim $fs/etc
    1.46 @@ -57,28 +57,26 @@
    1.47  
    1.48  post_install()
    1.49  {
    1.50 -    echo "Processing post-install commands..."
    1.51 -    cmd=$(readlink "$1/bin/vi")
    1.52 -    if [ ! "$cmd" = "/usr/bin/vim" ]; then
    1.53 -        echo ""
    1.54 -        echo "**** Actual VI link : $cmd"
    1.55 -        echo ""
    1.56 -        echo -n "Do you want vim  for /bin/vi (y/N) ? : "; read -t 30 anser
    1.57 -        if [ "$anser" == "y" ]; then
    1.58 -            echo ""
    1.59 -            echo -n "Removing vi link to make a new one pointing on /usr/bin/vim..."
    1.60 -            rm "$1/bin/vi" && ln -sf /usr/bin/vim-tiny "$1/bin/vi"
    1.61 -            status
    1.62 -        else
    1.63 -            echo ""
    1.64 -            echo "Leaving /bin/vi to : $cmd"
    1.65 -        fi
    1.66 -    fi
    1.67 +	cmd=$(readlink "$1/bin/vi")
    1.68 +	if [ "$cmd" != '/usr/bin/vim' ]; then
    1.69 +		echo ''
    1.70 +		echo "**** Actual VI link : $cmd"
    1.71 +		echo ''
    1.72 +		echo -n 'Do you want vim  for /bin/vi (y/N) ? : '; read -t 30 anser
    1.73 +		if [ "$anser" == 'y' ]; then
    1.74 +			echo ''
    1.75 +			action 'Removing vi link to make a new one pointing on /usr/bin/vim...'
    1.76 +			rm "$1/bin/vi" && ln -sf /usr/bin/vim-tiny "$1/bin/vi"
    1.77 +			status
    1.78 +		else
    1.79 +			echo ''
    1.80 +			echo "Leaving /bin/vi to : $cmd"
    1.81 +		fi
    1.82 +	fi
    1.83  }
    1.84  
    1.85  post_remove()
    1.86  {
    1.87  	# restore previous symlink
    1.88 -	echo "Processing post-remove commands..."
    1.89  	ln -sf /bin/busybox "$1/bin/vi"
    1.90  }