Date: Friday, August 28, 2020 @ 12:55:10 Author: freswa Revision: 690799
fix unquoted variables Modified: puzzles/trunk/PKGBUILD ----------+ PKGBUILD | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-08-28 12:54:38 UTC (rev 690798) +++ PKGBUILD 2020-08-28 12:55:10 UTC (rev 690799) @@ -17,10 +17,9 @@ '71488c328e2381c27a5084b30ea3516a') prepare() { - cd ${srcdir} tar xvf icons.tar.xz - cd ${srcdir}/${pkgname} + cd ${pkgname} # Generate the makefiles. ./mkfiles.pl @@ -36,7 +35,7 @@ } build() { - cd ${srcdir}/${pkgname} + cd ${pkgname} make -f Makefile.gtk prefix=/usr # Generating icons no longer works, xvfb-run reports @@ -46,35 +45,35 @@ package() { # Install the icons. - cd ${srcdir}/icons + cd icons - install -d ${pkgdir}/usr/share/icons/hicolor/48x48/apps/ + install -d "${pkgdir}"/usr/share/icons/hicolor/48x48/apps/ for f in ./*.png; do - install -Dm644 ${f} ${pkgdir}/usr/share/icons/hicolor/48x48/apps/${f} + install -Dm644 ${f} "${pkgdir}"/usr/share/icons/hicolor/48x48/apps/${f} done # Generate .desktop files. - cd ${srcdir}/${pkgname} + cd "${srcdir}"/${pkgname} - install -d ${pkgdir}/usr/share/applications - ./desktop.pl ${pkgdir}/usr/share/applications \ + install -d "${pkgdir}"/usr/share/applications + ./desktop.pl "${pkgdir}"/usr/share/applications \ /usr/bin \ /unused/argument # And finally, install the games. - cd ${srcdir}/${pkgname} + cd "${srcdir}"/${pkgname} - install -d ${pkgdir}/usr/{bin,share/licenses/${pkgname}} - install -Dm644 LICENCE ${pkgdir}/usr/share/licenses/${pkgname}/ + install -d "${pkgdir}"/usr/{bin,share/licenses/${pkgname}} + install -Dm644 LICENCE "${pkgdir}"/usr/share/licenses/${pkgname}/ - make -f Makefile.gtk prefix=/usr DESTDIR=${pkgdir} install + make -f Makefile.gtk prefix=/usr DESTDIR="${pkgdir}" install # Fix FS#14600 (name conflicts with other packages). - cd ${pkgdir}/usr/bin + cd "${pkgdir}"/usr/bin for oldname in *; do newname=puzzles-${oldname} - mv ${pkgdir}/usr/bin/${oldname} ${pkgdir}/usr/bin/${newname} + mv "${pkgdir}"/usr/bin/${oldname} "${pkgdir}"/usr/bin/${newname} sed -i "s_Exec=/usr/bin/${oldname}_Exec=/usr/bin/${newname}_" \ - ${pkgdir}/usr/share/applications/${oldname}.desktop + "${pkgdir}"/usr/share/applications/${oldname}.desktop done }