[arch-commits] Commit in minetest/trunk (PKGBUILD)

[Frederik Schwan]

    Date: Friday, August 28, 2020 @ 12:40:27
  Author: freswa
Revision: 690751

fix unquoted variables

Modified:
  minetest/trunk/PKGBUILD

----------+
 PKGBUILD |   46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-08-28 12:40:01 UTC (rev 690750)
+++ PKGBUILD	2020-08-28 12:40:27 UTC (rev 690751)
@@ -9,8 +9,8 @@
 license=('GPL')
 makedepends=('sqlite' 'freetype2' 'leveldb' 'postgresql' 'spatialindex' 'openal' 'libvorbis' 'curl'
              'irrlicht' 'hicolor-icon-theme' 'cmake' 'hiredis' 'luajit')
-source=($pkgname-$pkgver.tar.gz::https://github.com/minetest/minetest/archive/${pkgver}.tar.gz
-        $pkgname-data-$pkgver.tar.gz::https://github.com/minetest/minetest_game/archive/${pkgver}.tar.gz
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/minetest/minetest/archive/${{pkgver}}.tar.gz
+        ${pkgname}-data-${pkgver}.tar.gz::https://github.com/minetest/minetest_game/archive/${{pkgver}}.tar.gz
         minetest.service
         sysusers.d
         tmpfiles.d)
@@ -25,8 +25,8 @@
 }
 
 build() {
-  cd "$srcdir"/build-client
-  cmake ../$pkgname-$pkgver \
+  cd build-client
+  cmake ../${pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DBUILD_CLIENT=1 \
     -DENABLE_GETTEXT=1 \
@@ -37,8 +37,8 @@
     -DENABLE_REDIS=0
   make
 
-  cd "$srcdir"/build-server
-  cmake ../$pkgname-$pkgver \
+  cd build-server
+  cmake ../${pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DBUILD_CLIENT=0 \
     -DBUILD_SERVER=1 \
@@ -56,10 +56,10 @@
            'freetype2' 'luajit' 'postgresql-libs' 'spatialindex')
 
   cd build-client
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="${pkgdir}" install
 
-  rm -rf "$pkgdir"/usr/share/{minetest,doc}
-  rm "$pkgdir"/usr/share/man/man6/minetestserver.6
+  rm -rf "${pkgdir}"/usr/share/{minetest,doc}
+  rm "${pkgdir}"/usr/share/man/man6/minetestserver.6
 }
 
 package_minetest-server() {
@@ -68,30 +68,30 @@
            'postgresql-libs' 'spatialindex')
 
   cd build-server
-  make DESTDIR="$pkgdir" install
-  install -d  "$pkgdir"/etc/minetest
+  make DESTDIR="${pkgdir}" install
+  install -d  "${pkgdir}"/etc/minetest
   install -Dm644 ../minetest.service \
-    "$pkgdir"/usr/lib/systemd/system/minetest at .service
+    "${pkgdir}"/usr/lib/systemd/system/minetest at .service
 
-  rm -rf "$pkgdir"/usr/share/{minetest,metainfo,appdata,applications,icons,doc}
-  mv "$pkgdir"/usr/share/man/man6/minetest.6 "$pkgdir"/usr/share/man/man6/minetestserver.6
+  rm -rf "${pkgdir}"/usr/share/{minetest,metainfo,appdata,applications,icons,doc}
+  mv "${pkgdir}"/usr/share/man/man6/minetest.6 "${pkgdir}"/usr/share/man/man6/minetestserver.6
 
-  install -Dm644 ${srcdir}/tmpfiles.d ${pkgdir}/usr/lib/tmpfiles.d/minetest-server.conf
-  install -Dm644 ${srcdir}/sysusers.d ${pkgdir}/usr/lib/sysusers.d/minetest-server.conf
+  install -Dm644 "${srcdir}"/tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/minetest-server.conf
+  install -Dm644 "${srcdir}"/sysusers.d "${pkgdir}"/usr/lib/sysusers.d/minetest-server.conf
 }
 
 package_minetest-common() {
   pkgdesc='Common data files for minetest and minetest-server'
 
-  cd $pkgbase-$pkgver
-  install -d "$pkgdir"/usr/share/minetest
+  cd $pkgbase-${pkgver}
+  install -d "${pkgdir}"/usr/share/minetest
 
-  cp -r games builtin client fonts textures "$pkgdir"/usr/share/minetest/
-  cp -r "$srcdir"/build-client/locale "$pkgdir"/usr/share/minetest/
-  cp -r "$srcdir"/minetest_game-$pkgver "$pkgdir"/usr/share/minetest/games/minetest
-  rm "$pkgdir"/usr/share/minetest/games/minetest/.gitignore
+  cp -r games builtin client fonts textures "${pkgdir}"/usr/share/minetest/
+  cp -r "${srcdir}"/build-client/locale "${pkgdir}"/usr/share/minetest/
+  cp -r "${srcdir}"/minetest_game-${pkgver} "${pkgdir}"/usr/share/minetest/games/minetest
+  rm "${pkgdir}"/usr/share/minetest/games/minetest/.gitignore
 
   for file in doc/{fst_api,lua_api,menu_lua_api,protocol,world_format}.txt; do
-    install -Dm644 $file "$pkgdir"/usr/share/minetest/doc/$(basename $file)
+    install -Dm644 $file "${pkgdir}"/usr/share/minetest/doc/$(basename $file)
   done
 }