Fixup pkgbuild.

3 files changed, 24 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0402ba9db8f9..6ffd3c9b044a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cod4-wine-steam
-	pkgdesc = Call of Duty 4 Modern Warfare using WINE with data via Steam
+	pkgdesc = Call of Duty 4: Modern Warfare using WINE with data via Steam
 	pkgver = 1.8
-	pkgrel = 1
+	pkgrel = 2
 	url = https://store.steampowered.com/app/7940/Call_of_Duty_4_Modern_Warfare/
 	arch = i686
 	arch = x86_64
@@ -12,7 +12,7 @@ pkgbase = cod4-wine-steam
 	source = cod4.desktop
 	source = cod4.png
 	sha256sums = 5c3c872cd5a793ca5ff5b9867100754aac265d9f05a47796c4c4f82f0b13c5fd
-	sha256sums = 4114e972e71dd0283165642d78cfbe9b01a0e86d3d13c85ccc0dbb1dc9cb222f
+	sha256sums = 6854931dd152463e9af6d72d4a0eb0ad7792800bd203153d5d6fe02f6f5c048b
 	sha256sums = a9f40a206d1b93869f874afa54d8f45ac76bb2d3ea8491c17f6ec6072564619c
 
 pkgname = cod4-wine-steam
diff --git a/PKGBUILD b/PKGBUILD
index 6879a8d6da14..5fbf2c71cb7f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,50 @@
 # Maintainer: John-Michael Mulesa <jmulesa [at] gmail.com>
 
 pkgname=cod4-wine-steam
+_pkgname=cod4
 pkgver=1.8
-pkgrel=1
+pkgrel=2
+_steamid=7940
 arch=('i686' 'x86_64')
 makedepends=('steamcmd')
 depends=('wine')
-source=("cod4.sh" "cod4.desktop" "cod4.png")
-pkgdesc="Call of Duty 4 Modern Warfare using WINE with data via Steam"
+source=("${_pkgname}.sh" "${_pkgname}.desktop" "${_pkgname}.png")
+pkgdesc="Call of Duty 4: Modern Warfare using WINE with data via Steam"
 license=('custom')
 url='https://store.steampowered.com/app/7940/Call_of_Duty_4_Modern_Warfare/'
 sha256sums=('5c3c872cd5a793ca5ff5b9867100754aac265d9f05a47796c4c4f82f0b13c5fd'
-            '4114e972e71dd0283165642d78cfbe9b01a0e86d3d13c85ccc0dbb1dc9cb222f'
+            '6854931dd152463e9af6d72d4a0eb0ad7792800bd203153d5d6fe02f6f5c048b'
             'a9f40a206d1b93869f874afa54d8f45ac76bb2d3ea8491c17f6ec6072564619c')
 
 prepare() {
-    mkdir -p $srcdir/cod4
+    mkdir -p $srcdir/${_pkgname}
 
     # Use steamcmd to get data.
     printf "Enter your Steam username:"
     read steam_username
-    steamcmd +@sSteamCmdForcePlatformType windows +@ShutdownOnFailedCommand 1 +force_install_dir $srcdir/cod4 +login $steam_username "+app_update 7940 validate" +quit
+    steamcmd +@sSteamCmdForcePlatformType windows +@ShutdownOnFailedCommand 1 +force_install_dir $srcdir/${_pkgname} +login $steam_username "+app_update ${_steamid} validate" +quit
 }
 
 package() {
-    mkdir -p $pkgdir/opt/cod4
+    mkdir -p $pkgdir/opt/${_pkgname}
 
     # Move required files to pkgdir
-    cp -r $srcdir/cod4/* $pkgdir/opt/cod4/
-    rm -rf $pkgdir/opt/cod4/steamapps
-    rm $pkgdir/opt/cod4/installscript.vdf
+    cp -r $srcdir/${_pkgname}/* $pkgdir/opt/${_pkgname}/
+    rm -rf $pkgdir/opt/${_pkgname}/steamapps
+    rm $pkgdir/opt/${_pkgname}/*.vdf
     
     # Required for player profiles.
-    chmod o+w $pkgdir/opt/cod4
+    chmod o+w $pkgdir/opt/${_pkgname}
 
     # Install desktop file.
-    install -D -m 644 $srcdir/cod4.desktop \
-             $pkgdir/usr/share/applications/cod4.desktop
+    install -D -m 644 $srcdir/${_pkgname}.desktop \
+             $pkgdir/usr/share/applications/${_pkgname}.desktop
 
     # Install icon file.
-    install -D -m 644 $srcdir/cod4.png \
-             $pkgdir/usr/share/pixmaps/cod4.png
+    install -D -m 644 $srcdir/${_pkgname}.png \
+             $pkgdir/usr/share/pixmaps/${_pkgname}.png
 
     # Install bash startup script.
-    install -D -m 755 $srcdir/cod4.sh \
-             $pkgdir/usr/bin/cod4
+    install -D -m 755 $srcdir/${_pkgname}.sh \
+             $pkgdir/usr/bin/${_pkgname}
 }
diff --git a/cod4.desktop b/cod4.desktop
index a8e9f598edd5..73649f61a366 100644
--- a/cod4.desktop
+++ b/cod4.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Name=Call of Duty 4
-Comment=Call of Duty 4 Modern Warfare
+Name=Call of Duty 4: Modern Warfare
+Comment=Call of Duty 4: Modern Warfare WINE
 Exec=/usr/bin/cod4
 Icon=cod4
 Terminal=false