wok-next diff nvidia-96xx/receipt @ rev 18741
Finish to remove redundant messages 'Processing * commands...'; KISS get-msttcorefonts; add get-msttcorefonts2
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Fri Dec 25 15:23:46 2015 +0200 (2015-12-25) |
parents | 9e01bc6321ea |
children | 0c85739e5ac3 |
line diff
1.1 --- a/nvidia-96xx/receipt Sun Dec 20 15:13:45 2015 +0100 1.2 +++ b/nvidia-96xx/receipt Fri Dec 25 15:23:46 2015 +0200 1.3 @@ -26,7 +26,7 @@ 1.4 make SYSSRC="/usr/src/linux" module 2>&1 | sed s'/ERROR:/error:/' && 1.5 xz nvidia.ko 1.6 } 1.7 - 1.8 + 1.9 # Rules to gen a SliTaz package suitable for Tazpkg. 1.10 genpkg_rules() 1.11 { 1.12 @@ -34,8 +34,8 @@ 1.13 1.14 mkdir -p $fs/usr/share $fs/usr/lib/X11 $fs/usr/share/licenses/$PACKAGE 1.15 mkdir -p $fs/lib/modules/$kvers-slitaz/kernel/drivers/video 1.16 - mkdir -p $fs/usr/share/doc/$PACKAGE 1.17 - 1.18 + mkdir -p $fs/usr/share/doc/$PACKAGE 1.19 + 1.20 # Compress and install module 1.21 cp $src/usr/src/nv/nvidia.ko.xz \ 1.22 $fs/lib/modules/$kvers-slitaz/kernel/drivers/video/ 1.23 @@ -53,55 +53,43 @@ 1.24 cp -a $src/usr/X11R6/lib/* $fs/usr/lib/X11 1.25 1.26 # Links 1.27 - for i in `find $fs -iname *.so*`; do 1.28 - ln -s `basename $i` `dirname $i`/`basename ${i/so.${VERSION}/so/}` 1.29 - ln -s `basename $i` `dirname $i`/`basename ${i/so.${VERSION}/so.1/}` 1.30 + for i in $(find $fs -iname *.so*); do 1.31 + ln -s $(basename $i) $(dirname $i)/$(basename ${i/so.${VERSION}/so/}) 1.32 + ln -s $(basename $i) $(dirname $i)/$(basename ${i/so.${VERSION}/so.1/}) 1.33 done 1.34 } 1.35 1.36 pre_install() 1.37 { 1.38 - echo "" 1.39 - echo -e "\033[1m PROPRIETARY LICENSE:\033[0m $2" 1.40 - echo "================================================================================" 1.41 - echo "You are installing a package with proprietary license." 1.42 - echo "You must accept the license." 1.43 - echo "================================================================================" 1.44 - echo "" 1.45 + title 'PROPRIETARY LICENSE' 1.46 + echo 'You are installing a package with proprietary license.' 1.47 + echo 'You must accept the license.' 1.48 + footer 1.49 } 1.50 1.51 post_install() 1.52 { 1.53 - echo "Processing post-install commands..." 1.54 + newline 1.55 chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz 1.56 1.57 # correct .desktop file file 1.58 sed -i 's:__UTILS_PATH__/::' "$1/usr/share/applications/nvidia-settings.desktop" 1.59 sed -i 's:__PIXMAP_PATH__/::' "$1/usr/share/applications/nvidia-settings.desktop" 1.60 1.61 - echo "" 1.62 - echo -e "\033[1m NVIDIA LICENSE INFORMATION:\033[0m $2" 1.63 - echo "================================================================================" 1.64 + title 'NVIDIA LICENSE INFORMATION' 1.65 echo "For installing this package, you have to accept the $PACKAGE license." 1.66 - echo "The license is stored in /usr/share/licenses/$PACKAGE " 1.67 + echo "The license is stored in /usr/share/licenses/$PACKAGE " 1.68 echo -n "Would you like to read the license (y/N) : "; read anser 1.69 - if [ "$anser" = "y" ]; then 1.70 - cat /usr/share/licenses/"$PACKAGE"/LICENSE | more 1.71 - echo "" 1.72 + if [ "$anser" == 'y' ]; then 1.73 + more /usr/share/licenses/"$PACKAGE"/LICENSE 1.74 + echo 1.75 fi 1.76 - echo "================================================================================" 1.77 + separator 1.78 echo -n "Do you accept the license (y/N) : "; read anser 1.79 - if [ "$anser" = "N" ]; then 1.80 - echo "You did not accept the license, Removing the pkg." 1.81 - tazpkg remove "$PACKAGE" 1.82 + if [ "$anser" == 'N' ]; then 1.83 + echo "You did not accept the license, Removing the pkg." 1.84 + tazpkg remove "$PACKAGE" 1.85 fi 1.86 - 1.87 -} 1.88 - 1.89 -post_remove() 1.90 -{ 1.91 - echo "Processing post-remove commands..." 1.92 - depmod -a 1.93 } 1.94 1.95 TAZBB_NO_INSTALL="because this is not hardware neutral"