wok diff vim/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 | 02c70d036ea0 |
line diff
1.1 --- a/vim/receipt Sun Dec 20 15:13:45 2015 +0100 1.2 +++ b/vim/receipt Fri Dec 25 15:23:46 2015 +0200 1.3 @@ -23,18 +23,19 @@ 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 - ./configure --prefix=/usr \ 1.9 - --cache-file=$PWD/config.cache \ 1.10 - --infodir=/usr/share/info \ 1.11 - --with-features=normal \ 1.12 - --with-x=no \ 1.13 - --disable-gui \ 1.14 - --enable-multibyte \ 1.15 - --disable-motif-check \ 1.16 - --disable-athena-check \ 1.17 - --mandir=/usr/share/man $CONFIGURE_ARGS && 1.18 - 1.19 + 1.20 + ./configure \ 1.21 + --prefix=/usr \ 1.22 + --cache-file=$PWD/config.cache \ 1.23 + --infodir=/usr/share/info \ 1.24 + --with-features=normal \ 1.25 + --with-x=no \ 1.26 + --disable-gui \ 1.27 + --enable-multibyte \ 1.28 + --disable-motif-check \ 1.29 + --disable-athena-check \ 1.30 + --mandir=/usr/share/man $CONFIGURE_ARGS && 1.31 + 1.32 make VIMRCLOC=/etc/vim VIMRUNTIMEDIR=/usr/share/vim/vim73 MAKE="make -e" && 1.33 make DESTDIR=$DESTDIR install 1.34 mkdir -p $DESTDIR/etc/vim 1.35 @@ -53,28 +54,26 @@ 1.36 1.37 post_install() 1.38 { 1.39 - echo "Processing post-install commands..." 1.40 - cmd=$(readlink "$1/bin/vi") 1.41 - if [ ! "$cmd" = "/usr/bin/vim" ]; then 1.42 - echo "" 1.43 - echo "**** Actual VI link : $cmd" 1.44 - echo "" 1.45 - echo -n "Do you want vim for /bin/vi (y/N) ? : "; read -t 30 anser 1.46 - if [ "$anser" == "y" ]; then 1.47 - echo "" 1.48 - echo -n "Removing vi link to make a new one pointing on /usr/bin/vim..." 1.49 - rm "$1/bin/vi" && ln -sf /usr/bin/vim "$1/bin/vi" 1.50 - status 1.51 - else 1.52 - echo "" 1.53 - echo "Leaving /bin/vi to : $cmd" 1.54 - fi 1.55 - fi 1.56 + cmd=$(readlink "$1/bin/vi") 1.57 + if [ "$cmd" != '/usr/bin/vim' ]; then 1.58 + echo '' 1.59 + echo "**** Actual VI link : $cmd" 1.60 + echo '' 1.61 + echo -n 'Do you want vim for /bin/vi (y/N) ? : '; read -t 30 anser 1.62 + if [ "$anser" == 'y' ]; then 1.63 + echo '' 1.64 + echo -n 'Removing vi link to make a new one pointing on /usr/bin/vim...' 1.65 + rm "$1/bin/vi" && ln -sf /usr/bin/vim "$1/bin/vi" 1.66 + status 1.67 + else 1.68 + echo '' 1.69 + echo "Leaving /bin/vi to : $cmd" 1.70 + fi 1.71 + fi 1.72 } 1.73 1.74 post_remove() 1.75 { 1.76 # restore previous symlink 1.77 - echo "Processing post-remove commands..." 1.78 ln -sf /bin/busybox "$1/bin/vi" 1.79 }