Minor modernizations of rtcw pkgbuild

* Quote paths with variable names
* Replace build() with package()
* Use sha256sums
* Delimit variables with curly braces

2 files changed, 57 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ee0ae384938a..e484cc8f0542 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,14 +17,14 @@ pkgbase = wolf
 	source = wolfded.launcher
 	source = http://www.slashbunny.com/aur/wolf/libstdc++-libc6.2-2.so.3
 	source = ftp://ftp.internat.freebsd.org/pub/FreeBSD/distfiles/wolf-linux-1.41b.x86.run
-	md5sums = dbc81736f44e38496df2dfd6282364e6
-	md5sums = b04b3a8fdb0c288aa00adb2cdb859724
-	md5sums = ba4d698848b548b1b1cab4e121d0b1e3
-	md5sums = dc663542081c157567a743ba24e76735
-	md5sums = ba4d698848b548b1b1cab4e121d0b1e3
-	md5sums = 11bcba217cf10252cb980f70f32c6e19
-	md5sums = 84824b4081be220646a5804327c28546
-	md5sums = 2aa37968aff19d665ed6c001773b2de3
+	sha256sums = 20adb799ec0e1adef579acc02ecbd63486dc9bfe90ef48a72e1ea9049d017558
+	sha256sums = f8dc16a01bf3c5fc7d3914315ffec570f5ae4f148fccffdd05326a589dabf060
+	sha256sums = 7fca88d5c2ca1ad9d5f782f7a7c092246f91112db8918a032234f827de123a7e
+	sha256sums = ed85d6984e73a33e153269d964e7077eea7333aa6894737248119374bda02c65
+	sha256sums = 7fca88d5c2ca1ad9d5f782f7a7c092246f91112db8918a032234f827de123a7e
+	sha256sums = b9fc003949be3b5b5265aa94611df087f0aa11c4036050cdb14ee33f5548b776
+	sha256sums = cadd9a1d2bf0f991f0a0f8977c76701cbcc9a3e8ffeaba2838c98969fee340e6
+	sha256sums = 2921425c1b429147c1bc6f0c6a8664bec502ae86a2d6bccfaa1162f75dce89f3
 
 pkgname = wolf
 
diff --git a/PKGBUILD b/PKGBUILD
index 21df7ca861a6..ba49fca92d88 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Contributor: Slash <demodevil5[at]yahoo[dot]com>
+# Maintainer: Slash <demodevil5[at]yahoo[dot]com>
 
 pkgname=wolf
 pkgver=1.41b
@@ -16,89 +16,91 @@ source=('wolfsp.desktop' 'wolfmp.desktop' \
 'wolf.launcher' 'wolfsp.launcher' 'wolfmp.launcher' 'wolfded.launcher' \
 'http://www.slashbunny.com/aur/wolf/libstdc++-libc6.2-2.so.3' \
 "ftp://ftp.internat.freebsd.org/pub/FreeBSD/distfiles/wolf-linux-${pkgver}.x86.run")
-md5sums=('dbc81736f44e38496df2dfd6282364e6'
-         'b04b3a8fdb0c288aa00adb2cdb859724'
-         'ba4d698848b548b1b1cab4e121d0b1e3'
-         'dc663542081c157567a743ba24e76735'
-         'ba4d698848b548b1b1cab4e121d0b1e3'
-         '11bcba217cf10252cb980f70f32c6e19'
-         '84824b4081be220646a5804327c28546'
-         '2aa37968aff19d665ed6c001773b2de3')
-
-build() {
+sha256sums=('20adb799ec0e1adef579acc02ecbd63486dc9bfe90ef48a72e1ea9049d017558'
+            'f8dc16a01bf3c5fc7d3914315ffec570f5ae4f148fccffdd05326a589dabf060'
+            '7fca88d5c2ca1ad9d5f782f7a7c092246f91112db8918a032234f827de123a7e'
+            'ed85d6984e73a33e153269d964e7077eea7333aa6894737248119374bda02c65'
+            '7fca88d5c2ca1ad9d5f782f7a7c092246f91112db8918a032234f827de123a7e'
+            'b9fc003949be3b5b5265aa94611df087f0aa11c4036050cdb14ee33f5548b776'
+            'cadd9a1d2bf0f991f0a0f8977c76701cbcc9a3e8ffeaba2838c98969fee340e6'
+            '2921425c1b429147c1bc6f0c6a8664bec502ae86a2d6bccfaa1162f75dce89f3')
+
+package() {
     # Create Destination Directories
-    install -d $pkgdir/opt/wolf/ $pkgdir/usr/bin/ $srcdir/wolf/
+    install -d "${pkgdir}/opt/wolf/" "${pkgdir}/usr/bin/" "${srcdir}/wolf/"
 
     # Set Install Files to Executable
-    chmod +x $srcdir/wolf-linux-${pkgver}.x86.run
+    chmod +x "${srcdir}/wolf-linux-${pkgver}.x86.run"
 
     # Extract Linux Game Files
-    cd $srcdir/wolf/
-    $srcdir/wolf-linux-${pkgver}.x86.run --noexec --tar xf --group=root --owner=root
+    cd "${srcdir}/wolf/"
+    "${srcdir}/wolf-linux-${pkgver}.x86.run" --noexec --tar xf --group=root --owner=root
 
     # Move Binaries to Main Directory
-    cp $srcdir/wolf/bin/Linux/x86/{wolf.x86,wolfded.x86,wolfsp.x86} $srcdir/wolf/
+    cp "${srcdir}/wolf/bin/Linux/x86/"{wolf.x86,wolfded.x86,wolfsp.x86} \
+        "${srcdir}/wolf/"
 
     # Remove Unneeded Files and Directories
-    rm -r $srcdir/wolf/{bin,setup.data,setup.sh,CHANGES~}
+    rm -r "${srcdir}/wolf/"{bin,setup.data,setup.sh,CHANGES~}
 
     # Fix Permissions (Owner, Directory, and File Permissions)
-    /bin/chown -R root:root $srcdir/wolf/
-    /bin/chmod 0755 $srcdir/wolf/Docs/PunkBuster
-    /bin/chmod 0644 $srcdir/wolf/{Docs/{PunkBuster/{admins/index.htm,players/index.htm},Update_readme.htm},RTCW-README-1.4.txt}
+    /bin/chown -R root:root "${srcdir}/wolf/"
+    /bin/chmod 0755 "${srcdir}/wolf/Docs/PunkBuster"
+    /bin/chmod 0644 "${srcdir}/wolf/"{Docs/{PunkBuster/{admins/index.htm,players/index.htm},Update_readme.htm},RTCW-README-1.4.txt}
 
     # Move Data to Package Directory
-    mv $srcdir/wolf/ $pkgdir/opt/
+    mv "${srcdir}/wolf/" "${pkgdir}/opt/"
 
     # Install Launcher Script (Single Player Client)
-    install -D -m 755 $srcdir/wolfsp.launcher \
-        $pkgdir/usr/bin/wolfsp
+    install -D -m 755 "${srcdir}/wolfsp.launcher" \
+        "${pkgdir}/usr/bin/wolfsp"
 
     # Install Launcher Script (Multiplayer Client)
-    install -D -m 755 $srcdir/wolf.launcher \
-        $pkgdir/usr/bin/wolf
+    install -D -m 755 "${srcdir}/wolf.launcher" \
+        "${pkgdir}/usr/bin/wolf"
 
     # Install Launcher Script (Multiplayer Client)
-    install -D -m 755 $srcdir/wolfmp.launcher \
-        $pkgdir/usr/bin/wolfmp
+    install -D -m 755 "${srcdir}/wolfmp.launcher" \
+        "${pkgdir}/usr/bin/wolfmp"
 
     # Install Launcher Script (Multipler Server)
-    install -D -m 755 $srcdir/wolfded.launcher \
-        $pkgdir/usr/bin/wolfded
+    install -D -m 755 "${srcdir}/wolfded.launcher" \
+        "${pkgdir}/usr/bin/wolfded"
 
     # Install old libstdc++ library needed for Wolf to run
-    install -D -m 644 $srcdir/libstdc++-libc6.2-2.so.3  \
-        $pkgdir/opt/wolf/libstdc++-libc6.2-2.so.3 
+    install -D -m 644 "${srcdir}/libstdc++-libc6.2-2.so.3"  \
+        "${pkgdir}/opt/wolf/libstdc++-libc6.2-2.so.3"
 
     # Install License (Return to Castle Wolfenstein)
-    install -D -m 644 $pkgdir/opt/wolf/Docs/License.txt \
-        $pkgdir/usr/share/licenses/$pkgname/License.txt
+    install -D -m 644 "${pkgdir}/opt/wolf/Docs/License.txt" \
+        "${pkgdir}/usr/share/licenses/${pkgname}/License.txt"
 
     # Install License (PunkBuster)
-    install -D -m 644 $pkgdir/opt/wolf/pb/PB_EULA.txt \
-        $pkgdir/usr/share/licenses/$pkgname/PB_EULA.txt
+    install -D -m 644 "${pkgdir}/opt/wolf/pb/PB_EULA.txt" \
+        "${pkgdir}/usr/share/licenses/${pkgname}/PB_EULA.txt"
 
     # Install Desktop File (Single Player)
-    install -D -m 644 $srcdir/wolfsp.desktop \
-        $pkgdir/usr/share/applications/wolfsp.desktop
+    install -D -m 644 "${srcdir}/wolfsp.desktop" \
+        "${pkgdir}/usr/share/applications/wolfsp.desktop"
 
     # Install Desktop File (Multi Player)
-    install -D -m 644 $srcdir/wolfmp.desktop \
-        $pkgdir/usr/share/applications/wolfmp.desktop
+    install -D -m 644 "${srcdir}/wolfmp.desktop" \
+        "${pkgdir}/usr/share/applications/wolfmp.desktop"
 
     # Install Icon File (Single Player)
-    install -D -m 644 $pkgdir/opt/wolf/WolfSP.xpm \
-        $pkgdir/usr/share/pixmaps/WolfSP.xpm
+    install -D -m 644 "${pkgdir}/opt/wolf/WolfSP.xpm" \
+        "${pkgdir}/usr/share/pixmaps/WolfSP.xpm"
 
     # Install Icon File (Multi Player)
-    install -D -m 644 $pkgdir/opt/wolf/WolfMP.xpm \
-        $pkgdir/usr/share/pixmaps/WolfMP.xpm
+    install -D -m 644 "${pkgdir}/opt/wolf/WolfMP.xpm" \
+        "${pkgdir}/usr/share/pixmaps/WolfMP.xpm"
 
     # Remove Licenses from Data Directory
-    rm $pkgdir/opt/wolf/Docs/License.txt
-    rm $pkgdir/opt/wolf/pb/PB_EULA.txt
+    rm "${pkgdir}/opt/wolf/Docs/License.txt"
+    rm "${pkgdir}/opt/wolf/pb/PB_EULA.txt"
 
     # Use a more modern way for opening urls
-    rm $pkgdir/opt/wolf/openurl.sh
-    ln -s /usr/bin/xdg-open $pkgdir/opt/wolf/openurl.sh
+    rm "${pkgdir}/opt/wolf/openurl.sh"
+    ln -sf /usr/bin/xdg-open "${pkgdir}/opt/wolf/openurl.sh"
 }
+