Protect srcdir and pkgdir variables when they contain whitespaces

2 files changed, 8 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 37fd4eef08d5..12d03a346446 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
-# Generated by makepkg 5.1.3
-# Fri Aug 16 16:37:31 UTC 2019
+# Generated by makepkg 6.0.1
+# Wed Sep 21 09:47:22 UTC 2022
 pkgbase = nimbus-git
 	pkgdesc = The default OpenIndiana theme
 	pkgver = 1.0.r7.g172733a
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/OpenIndiana/nimbus
 	arch = any
 	license = GPL
@@ -23,4 +23,3 @@ pkgbase = nimbus-git
 	sha256sums = 1e4ab3a16451487528622556f586e1ac007accc5e9bf51181824f96b9740a207
 
 pkgname = nimbus-git
-
diff --git a/PKGBUILD b/PKGBUILD
index a1e1717de57c..83976b792abc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=nimbus-git
 _gitname=nimbus
 pkgver=1.0.r7.g172733a
-pkgrel=1
+pkgrel=2
 pkgdesc="The default OpenIndiana theme"
 arch=("any")
 url="https://github.com/OpenIndiana/nimbus"
@@ -42,10 +42,9 @@ build() {
 }
 
 package() {
-    cd "$srcdir"
-    make -C "${_gitname}" install DESTDIR=$pkgdir
+    make -C "${_gitname}" install DESTDIR="$pkgdir"
 
-    install -d -m755 $pkgdir/usr/share/mate-panel/pixmaps/nimbus
-    install -m644 bottom-panel-image.png $pkgdir/usr/share/mate-panel/pixmaps/nimbus/bottom-panel-image.png
-    install -m644 top-panel-image.png $pkgdir/usr/share/mate-panel/pixmaps/nimbus/top-panel-image.png
+    install -d -m755 "$pkgdir/usr/share/mate-panel/pixmaps/nimbus"
+    install -m644 bottom-panel-image.png "$pkgdir/usr/share/mate-panel/pixmaps/nimbus/bottom-panel-image.png"
+    install -m644 top-panel-image.png "$pkgdir/usr/share/mate-panel/pixmaps/nimbus/top-panel-image.png"
 }