Date: Monday, September 23, 2019 @ 20:09:00
Author: andyrtr
Revision: 363320
fix quoting
Modified:
libreoffice-still/trunk/PKGBUILD
----------+
PKGBUILD | 66 ++++++++++++++++++++++++++++++-------------------------------
1 file changed, 33 insertions(+), 33 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-09-23 20:04:40 UTC (rev 363319)
+++ PKGBUILD 2019-09-23 20:09:00 UTC (rev 363320)
@@ -102,19 +102,19 @@
cd libreoffice-$_LOver
# move external sources into place
- mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources
+ mkdir "${srcdir}"/ext_sources && pushd "${srcdir}"/ext_sources
for source in "${noextract[@]}"; do
- ln -s ${srcdir}/$source .
+ ln -s "${srcdir}"/$source .
done
popd
# unowinreg.dll must be a file not a symlink or the result will become
a broken symlink
# /usr/share/libreoffice/sdk/classes/win/unowinreg.dll ->
/build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll
- rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll
- cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
${srcdir}/ext_sources
+ rm
"${srcdir}"/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+ cp -f "${srcdir}"/185d60944ea767075d27247c3162b3bc-unowinreg.dll
"${srcdir}"/ext_sources
# fix not upstreamable pyuno paths - FS#54250
- patch -Np1 -i
${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
+ patch -Np1 -i
"${srcdir}"/make-pyuno-work-with-system-wide-module-install.diff
#use the CFLAGS but remove the LibO overridden ones
for i in $CFLAGS; do
@@ -218,12 +218,12 @@
touch src.downloaded
make build-nocheck
- mkdir ${srcdir}/fakeinstall
- make DESTDIR=${srcdir}/fakeinstall distro-pack-install
+ mkdir "${srcdir}"/fakeinstall
+ make DESTDIR="${srcdir}"/fakeinstall distro-pack-install
}
#check() {
-# cd ${srcdir}/build
+# cd "${srcdir}"/build
# make check
#}
@@ -234,25 +234,25 @@
conflicts=('libreoffice-fresh-sdk')
for dir in $(grep -h ^%dir
libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do
- install -dm755 ${pkgdir}/${dir/\%dir/}
+ install -dm755 "${pkgdir}"/${dir/\%dir/}
done
for file in $(grep -h -v ^%dir
libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do
dirname=$(dirname $file)
- [[ -d ${pkgdir}/$dirname ]] || install -dm755 ${pkgdir}/$dirname
- mv ${srcdir}/fakeinstall/${file} ${pkgdir}/$file
+ [[ -d "${pkgdir}"/$dirname ]] || install -dm755
"${pkgdir}"/$dirname
+ mv "${srcdir}"/fakeinstall/${file} "${pkgdir}"/$file
done
# fix environment path to keep compatibility with other
java-environments
sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" \
- ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.sh
+ "${pkgdir}"/usr/lib/libreoffice/sdk/setsdkenv_unix.sh
# fix permissions
- find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x
{} +
+ find "${pkgdir}"/usr/lib/libreoffice/sdk/examples -type f -exec chmod
-x {} +
# add LibreOfficeKit headers; FS#48066
- install -dm755 ${pkgdir}/usr/include/LibreOfficeKit
- install -v -m644 ${srcdir}/libreoffice-$_LOver/include/LibreOfficeKit/*
${pkgdir}/usr/include/LibreOfficeKit
+ install -dm755 "${pkgdir}"/usr/include/LibreOfficeKit
+ install -v -m644
"${srcdir}"/libreoffice-$_LOver/include/LibreOfficeKit/*
"${pkgdir}"/usr/include/LibreOfficeKit
}
package_libreoffice-still() {
@@ -291,42 +291,42 @@
provides=('libreoffice' 'libreoffice-en-US')
conflicts=('libreoffice-fresh')
- mv fakeinstall/* ${pkgdir}/
+ mv fakeinstall/* "${pkgdir}"/
# put configuration files into place
- install -dm755 ${pkgdir}/etc/libreoffice
- install -m644
${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} \
- ${pkgdir}/etc/libreoffice/
- install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf \
- ${pkgdir}/etc/libreoffice/
+ install -dm755 "${pkgdir}"/etc/libreoffice
+ install -m644
"${pkgdir}"/usr/lib/libreoffice/program/{bootstraprc,sofficerc} \
+ "${pkgdir}"/etc/libreoffice/
+ install -m644
"${pkgdir}"/usr/lib/libreoffice/share/psprint/psprint.conf \
+ "${pkgdir}"/etc/libreoffice/
# install dummy links to make them found by LibO
- cd ${pkgdir}/usr/lib/libreoffice/program/
+ cd "${pkgdir}"/usr/lib/libreoffice/program/
ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
- cd ${pkgdir}/usr/lib/libreoffice/share/psprint/
+ cd "${pkgdir}"/usr/lib/libreoffice/share/psprint/
ln -vsf /etc/libreoffice/psprint.conf .
# allow to preset desired VLC
- install -dm755 ${pkgdir}/etc/profile.d
- install -m644 ${srcdir}/libreoffice-still.{sh,csh}
${pkgdir}/etc/profile.d/
+ install -dm755 "${pkgdir}"/etc/profile.d
+ install -m644 "${srcdir}"/libreoffice-still.{sh,csh}
"${pkgdir}"/etc/profile.d/
# make pyuno find its modules
- install -dm755 ${pkgdir}/usr/lib/python3.7/site-packages
+ install -dm755 "${pkgdir}"/usr/lib/python3.7/site-packages
ln -svf /usr/lib/libreoffice/program/uno.py \
- ${pkgdir}/usr/lib/python3.7/site-packages/uno.py
+ "${pkgdir}"/usr/lib/python3.7/site-packages/uno.py
ln -svf /usr/lib/libreoffice/program/unohelper.py \
- ${pkgdir}/usr/lib/python3.7/site-packages/unohelper.py
+ "${pkgdir}"/usr/lib/python3.7/site-packages/unohelper.py
# add a symlink required for gnome-documents; FS#51887
#
https://lists.freedesktop.org/archives/libreoffice/2016-March/073787.html
ln -svf /usr/lib/libreoffice/program/liblibreofficekitgtk.so \
- ${pkgdir}/usr/lib/liblibreofficekitgtk.so
+ "${pkgdir}"/usr/lib/liblibreofficekitgtk.so
# cleanup
- rm -rf ${pkgdir}/usr/share/libreoffice/sdk
+ rm -rf "${pkgdir}"/usr/share/libreoffice/sdk
# add application descriptions
- install -dm755 ${pkgdir}/usr/share/metainfo
- install -v -m644
${srcdir}/libreoffice-$_LOver/sysui/desktop/appstream-appdata/*.xml \
- ${pkgdir}/usr/share/metainfo
+ install -dm755 "${pkgdir}"/usr/share/metainfo
+ install -v -m644
"${srcdir}"/libreoffice-$_LOver/sysui/desktop/appstream-appdata/*.xml \
+ "${pkgdir}"/usr/share/metainfo
}
