wok diff nvidia-173xx/receipt @ rev 18734
Remove redundant messages in {pre|post}_{install|remove}() in random packages
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Mon Dec 21 02:53:09 2015 +0200 (2015-12-21) |
parents | 9e01bc6321ea |
children | 0c85739e5ac3 |
line diff
1.1 --- a/nvidia-173xx/receipt Sun Dec 20 15:13:45 2015 +0100 1.2 +++ b/nvidia-173xx/receipt Mon Dec 21 02:53:09 2015 +0200 1.3 @@ -27,34 +27,37 @@ 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 +{ 1.13 EXTRAVERSION=_${kvers} 1.14 - 1.15 - mkdir -p $fs/usr/share $fs/usr/lib/X11 $fs/usr/share/licenses/$PACKAGE \ 1.16 - $fs/lib/modules/$kvers-slitaz/kernel/drivers/video \ 1.17 - $fs/usr/share/doc/$PACKAGE 1.18 - 1.19 + 1.20 + mkdir -p \ 1.21 + $fs/usr/share \ 1.22 + $fs/usr/lib/X11 \ 1.23 + $fs/usr/share/licenses/$PACKAGE \ 1.24 + $fs/lib/modules/$kvers-slitaz/kernel/drivers/video \ 1.25 + $fs/usr/share/doc/$PACKAGE 1.26 + 1.27 cp $src/usr/src/nv/nvidia.ko.xz \ 1.28 - $fs/lib/modules/$kvers-slitaz/kernel/drivers/video/ 1.29 + $fs/lib/modules/$kvers-slitaz/kernel/drivers/video/ 1.30 chown root $fs/lib/modules/$kvers-slitaz/kernel/drivers/video/nvidia.ko.xz 1.31 - chmod 0644 $fs/lib/modules/$kvers-slitaz/kernel/drivers/video/nvidia.ko.xz 1.32 - 1.33 + chmod 0644 $fs/lib/modules/$kvers-slitaz/kernel/drivers/video/nvidia.ko.xz 1.34 + 1.35 cp -a $src/LICENSE $fs/usr/share/licenses/$PACKAGE 1.36 cp -a $src/usr/bin $fs/usr 1.37 cp -a $src/nvidia-installer $fs/usr/bin 1.38 cp -a $src/usr/lib/*.so* $fs/usr/lib/ 1.39 cp -a $src/usr/lib/tls $fs/usr/lib/ 1.40 - cp -a $src/usr/X11R6/lib/libXvMCNVIDIA.so.$VERSION $fs/usr/lib 1.41 - cp -a $src/usr/X11R6/lib/modules $fs/usr/lib/X11/ 1.42 - cp -a $src/usr/share/applications $fs/usr/share 1.43 + cp -a $src/usr/X11R6/lib/libXvMCNVIDIA.so.$VERSION $fs/usr/lib 1.44 + cp -a $src/usr/X11R6/lib/modules $fs/usr/lib/X11/ 1.45 + cp -a $src/usr/share/applications $fs/usr/share 1.46 cp -a $src/usr/share/pixmaps $fs/usr/share 1.47 cp -a $src/usr/share/doc/* $fs/usr/share/doc/$PACKAGE/ 1.48 cp -a $src/usr/X11R6/lib/* $fs/usr/lib/X11 1.49 1.50 - ln -s libcuda.so.$VERSION $fs/usr/lib/libcuda.so 1.51 + ln -s libcuda.so.$VERSION $fs/usr/lib/libcuda.so 1.52 ln -s libcuda.so.$VERSION $fs/usr/lib/libcuda.so.1 1.53 ln -s libGL.so.$VERSION $fs/usr/lib/libGL.so 1.54 ln -s libGL.so.$VERSION $fs/usr/lib/libGL.so.1 1.55 @@ -69,51 +72,37 @@ 1.56 ln -s libXvMCNVIDIA.so.$VERSION $fs/usr/lib/libXvMCNVIDIA_dynamic.so 1.57 ln -s libnvidia-wfb.so.$VERSION $fs/usr/lib/X11/modules/libnvidia-wfb.so 1.58 ln -s libnvidia-wfb.so.$VERSION $fs/usr/lib/X11/modules/libnvidia-wfb.so.1 1.59 - ln -s libglx.so.$VERSION $fs/usr/lib/X11/modules/extensions/libglx.so 1.60 + ln -s libglx.so.$VERSION $fs/usr/lib/X11/modules/extensions/libglx.so 1.61 } 1.62 1.63 pre_install() 1.64 { 1.65 - echo "" 1.66 - echo -e "\033[1m PROPRIETARY LICENSE:\033[0m $2" 1.67 - echo "================================================================================" 1.68 + title "PROPRIETARY LICENSE" 1.69 echo "You are installing a package with proprietary license." 1.70 echo "You must accept the license." 1.71 - echo "================================================================================" 1.72 - echo "" 1.73 - 1.74 + footer 1.75 } 1.76 1.77 post_install() 1.78 { 1.79 - echo "Processing post-install commands..." 1.80 - chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz 1.81 - 1.82 + chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz 1.83 + 1.84 # correct .desktop file file 1.85 sed -i 's:__UTILS_PATH__/::' "$1/usr/share/applications/nvidia-settings.desktop" 1.86 sed -i 's:__PIXMAP_PATH__/::' "$1/usr/share/applications/nvidia-settings.desktop" 1.87 - 1.88 - echo "" 1.89 - echo -e "\033[1m NVIDIA LICENSE INFORMATION:\033[0m $2" 1.90 - echo "================================================================================" 1.91 + 1.92 + title "NVIDIA LICENSE INFORMATION" 1.93 echo "For installing this package, you have to accept the $PACKAGE license." 1.94 - echo "The license is stored in /usr/share/licenses/$PACKAGE " 1.95 - echo -n "Would you like to read the license (y/N) : "; read anser 1.96 - if [ "$anser" = "y" ]; then 1.97 - cat /usr/share/licenses/"$PACKAGE"/LICENSE | more 1.98 - echo "" 1.99 + echo "The license is stored in /usr/share/licenses/$PACKAGE " 1.100 + echo -n "Would you like to read the license (y/N) : "; read anser 1.101 + if [ "$anser" == 'y' ]; then 1.102 + more "$1/usr/share/licenses/$PACKAGE/LICENSE" 1.103 + newline 1.104 fi 1.105 - echo "================================================================================" 1.106 - echo -n "Do you accept the license (y/N) : "; read anser 1.107 - if [ "$anser" = "N" ]; then 1.108 - echo "You did not accept the license, Removing the pkg." 1.109 - tazpkg remove "$PACKAGE" 1.110 + separator 1.111 + echo -n 'Do you accept the license (y/N) : '; read anser 1.112 + if [ "$anser" == 'N' ]; then 1.113 + echo 'You did not accept the license, Removing the pkg.' 1.114 + tazpkg remove "$PACKAGE" 1.115 fi 1.116 - 1.117 } 1.118 - 1.119 -post_remove() 1.120 -{ 1.121 - echo "Processing post-remove commands..." 1.122 - depmod -a 1.123 -}