Protect srcdir and pkgdir variables when they contain whitespaces

2 files changed, 11 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a5a35cbfd2ac..ed704bf42ebe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by makepkg 6.0.1
-# Wed Apr 20 15:50:10 UTC 2022
+# Wed Sep 21 09:43:09 UTC 2022
 pkgbase = molotov
 	pkgdesc = Streaming access to French (only) TV channels.
 	pkgver = 4.5.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.molotov.tv/
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 66aac4a302b0..b9ed8cc49c09 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=molotov
 # Check last version by a call on https://desktop-auto-upgrade.molotov.tv/linux/manifest.json
 pkgver=4.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Streaming access to French (only) TV channels."
 arch=('i686' 'x86_64')
 url="http://www.molotov.tv/"
@@ -17,35 +17,31 @@ sha256sums=('dcea91f794270f11d89ab3e674b09cd02014f67442b704ef8d9b798d47f5bbd4'
             '3a2d0c45ec2a964b229ee44a729d5d86319d573296ca44c8a33e171ce23a3b47')
 
 prepare() {
-    cd $srcdir
     chmod u+x Molotov-${pkgver}.AppImage
     ./Molotov-${pkgver}.AppImage --appimage-extract &> /dev/null
 }
 
 build() {
-    cd $srcdir
     sed -i "s/^Exec=AppRun --no-sandbox %U$/Exec=$pkgname/" squashfs-root/molotov.desktop
     sed -i "s/^Categories=AudioVideo/Categories=Video;Player;AudioVideo/" squashfs-root/molotov.desktop
     sed -i "s/MOLOTOV_VERSION/${pkgver}/g" molotov
 }
 
 package() {
-    cd $srcdir
-
-    install -d -m755 $pkgdir/usr/share/{applications,icons/hicolor}
-    install -d -m755 $pkgdir/opt/appimages
+    install -d -m755 "$pkgdir/usr/share/"{applications,icons/hicolor}
+    install -d -m755 "$pkgdir/opt/appimages"
     # TODO find a decent license
-    #install -d -m755 $pkgdir/usr/share/licenses/$pkgname
+    #install -d -m755 "$pkgdir/usr/share/licenses/$pkgname"
 
     hicolor="squashfs-root/usr/share/icons/hicolor"
     for size in $(ls -1 $hicolor); do
-        install -d -m755 $pkgdir/usr/share/icons/hicolor/$size/apps
-        install -D -m644 $hicolor/$size/apps/molotov.png $pkgdir/usr/share/icons/hicolor/$size/apps/molotov.png
+        install -d -m755 "$pkgdir/usr/share/icons/hicolor/$size/apps"
+        install -D -m644 $hicolor/$size/apps/molotov.png "$pkgdir/usr/share/icons/hicolor/$size/apps/molotov.png"
     done
 
-    install -D -m644 squashfs-root/molotov.desktop $pkgdir/usr/share/applications/appimagekit-molotov.desktop
-    install -D -m755 molotov $pkgdir/usr/bin/molotov
-    install -D -m755 Molotov-$pkgver.AppImage $pkgdir/opt/appimages/Molotov-$pkgver.AppImage
+    install -D -m644 squashfs-root/molotov.desktop "$pkgdir/usr/share/applications/appimagekit-molotov.desktop"
+    install -D -m755 molotov "$pkgdir/usr/bin/molotov"
+    install -D -m755 Molotov-$pkgver.AppImage "$pkgdir/opt/appimages/Molotov-$pkgver.AppImage"
     rm -r squashfs-root
 }