[arch-commits] Commit in vim/trunk (PKGBUILD)
Eric Bélanger
eric at archlinux.org
Mon Aug 22 05:09:50 UTC 2011
Date: Monday, August 22, 2011 @ 01:09:50
Author: eric
Revision: 136051
Add rgb.txt to vim-runtime (close FS#22661), Add quotes around srcdir and pkgdir
Modified:
vim/trunk/PKGBUILD
----------+
PKGBUILD | 72 ++++++++++++++++++++++++++++++++-----------------------------
1 file changed, 38 insertions(+), 34 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-08-22 04:56:03 UTC (rev 136050)
+++ PKGBUILD 2011-08-22 05:09:50 UTC (rev 136051)
@@ -31,7 +31,7 @@
##### Build #####
build() {
- cd ${srcdir}
+ cd "${srcdir}"
msg2 'Checking out source from Mercurial...'
@@ -70,7 +70,7 @@
cp -a vim-build gvim-build
- cd ${srcdir}/vim-build
+ cd "${srcdir}"/vim-build
./configure --prefix=/usr --localstatedir=/var/lib/vim \
--mandir=/usr/share/man --with-compiledby=ArchLinux \
@@ -81,7 +81,7 @@
make
- cd ${srcdir}/gvim-build
+ cd "${srcdir}"/gvim-build
./configure --prefix=/usr --localstatedir=/var/lib/vim \
--mandir=/usr/share/man --with-compiledby=ArchLinux \
@@ -100,14 +100,14 @@
depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'perl')
conflicts=('gvim')
- cd ${srcdir}/vim-build
- make -j1 VIMRCLOC=/etc DESTDIR=${pkgdir} install
+ cd "${srcdir}"/vim-build
+ make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
# provided by (n)vi in core
- rm ${pkgdir}/usr/bin/{ex,view}
+ rm "${pkgdir}"/usr/bin/{ex,view}
# delete some manpages
- find ${pkgdir}/usr/share/man -type d -name 'man1' 2>/dev/null | \
+ find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \
while read _mandir; do
cd ${_mandir}
rm -f ex.1 view.1 # provided by (n)vi
@@ -115,12 +115,12 @@
done
# Runtime provided by runtime package
- rm -r ${pkgdir}/usr/share/vim
+ rm -r "${pkgdir}"/usr/share/vim
# license
- install -dm755 ${pkgdir}/usr/share/licenses/vim
+ install -dm755 "${pkgdir}"/usr/share/licenses/vim
ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \
- ${pkgdir}/usr/share/licenses/vim/license.txt
+ "${pkgdir}"/usr/share/licenses/vim/license.txt
}
package_gvim() {
@@ -131,31 +131,31 @@
conflicts=('vim')
install=gvim.install
- cd ${srcdir}/gvim-build
- make -j1 VIMRCLOC=/etc DESTDIR=${pkgdir} install
+ cd "${srcdir}"/gvim-build
+ make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
# provided by (n)vi in core
- rm ${pkgdir}/usr/bin/{ex,view}
+ rm "${pkgdir}"/usr/bin/{ex,view}
# delete some manpages
- find ${pkgdir}/usr/share/man -type d -name 'man1' 2>/dev/null | \
+ find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \
while read _mandir; do
cd ${_mandir}
rm -f ex.1 view.1 # provided by (n)vi
done
# Move the runtime for later packaging
- mv ${pkgdir}/usr/share/vim ${srcdir}/runtime-install
+ mv "${pkgdir}"/usr/share/vim "${srcdir}"/runtime-install
# freedesktop links
- install -Dm644 ${srcdir}/gvim.desktop \
- ${pkgdir}/usr/share/applications/gvim.desktop
- install -Dm644 runtime/vim48x48.png ${pkgdir}/usr/share/pixmaps/gvim.png
+ install -Dm644 "${srcdir}"/gvim.desktop \
+ "${pkgdir}"/usr/share/applications/gvim.desktop
+ install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png
# license
- install -dm755 ${pkgdir}/usr/share/licenses/gvim
+ install -dm755 "${pkgdir}"/usr/share/licenses/gvim
ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \
- ${pkgdir}/usr/share/licenses/gvim/license.txt
+ "${pkgdir}"/usr/share/licenses/gvim/license.txt
}
package_vim-runtime() {
@@ -163,36 +163,40 @@
backup=(etc/vimrc)
# Install the runtime split from gvim
- install -dm755 ${pkgdir}/usr/share
- mv ${srcdir}/runtime-install ${pkgdir}/usr/share/vim
+ install -dm755 "${pkgdir}"/usr/share
+ mv "${srcdir}"/runtime-install "${pkgdir}"/usr/share/vim
# Don't forget logtalk.dict
- install -Dm644 ${srcdir}/gvim-build/runtime/ftplugin/logtalk.dict \
- ${pkgdir}/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict
+ install -Dm644 "${srcdir}"/gvim-build/runtime/ftplugin/logtalk.dict \
+ "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict
# fix FS#17216
sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \
- ${pkgdir}/usr/share/vim/${_versiondir}/filetype.vim
+ "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim
# patch filetype.vim for better handling of pacman related files
sed -i "s/rpmsave/pacsave/;s/rpmnew/pacnew/;s/,\*\.ebuild/\0,PKGBUILD*,*.install/" \
- ${pkgdir}/usr/share/vim/${_versiondir}/filetype.vim
+ "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim
sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \
- ${pkgdir}/usr/share/vim/${_versiondir}/ftplugin/changelog.vim
+ "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/changelog.vim
# make Aaron happy
- install -Dm644 ${srcdir}/pythoncomplete.vim \
- ${pkgdir}/usr/share/vim/${_versiondir}/autoload/pythoncomplete.vim
+ install -Dm644 "${srcdir}"/pythoncomplete.vim \
+ "${pkgdir}"/usr/share/vim/${_versiondir}/autoload/pythoncomplete.vim
# rc files
- install -Dm644 ${srcdir}/vimrc ${pkgdir}/etc/vimrc
- install -Dm644 ${srcdir}/archlinux.vim \
- ${pkgdir}/usr/share/vim/vimfiles/archlinux.vim
+ install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc
+ install -Dm644 "${srcdir}"/archlinux.vim \
+ "${pkgdir}"/usr/share/vim/vimfiles/archlinux.vim
+ # rgb.txt file
+ install -Dm644 "${srcdir}"/vim/runtime/rgb.txt \
+ "${pkgdir}"/usr/share/vim/${_versiondir}/rgb.txt
+
# license
- install -dm755 ${pkgdir}/usr/share/licenses/vim-runtime
+ install -dm755 "${pkgdir}"/usr/share/licenses/vim-runtime
ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \
- ${pkgdir}/usr/share/licenses/vim-runtime/license.txt
+ "${pkgdir}"/usr/share/licenses/vim-runtime/license.txt
}
# vim:set sw=2 sts=2 et:
More information about the arch-commits
mailing list