Fix mirror, quote strings with variables, add gitignore file for sources

3 files changed, 52 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7dfe8473294c..99df8c4126ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -18,16 +18,16 @@ pkgbase = doom3
 	source = doom3.launcher64
 	source = doom3-dedicated.launcher64
 	source = doom3.png
-	source = http://pnfiles.gamespy.com/hostedftp/planetdoom/fms/files/other/38/idtech4doom3sourceGPL.zip
+	source = ftp://ftp.idsoftware.com/idstuff/source/idtech4-doom3-source-GPL.zip
 	source = http://www.1337-server.net/doom3/doom3-linux-1.3.1.1304.x86.run
-	md5sums = da5f33feaa929c2c588a5a773c777e0f
-	md5sums = 6bdef1e111e5f450bca3f1c043caf4a2
-	md5sums = facb0291279621d997f9504924d7e9b1
-	md5sums = 7ccbdd8f07672c6c34b2fe1de131e57c
-	md5sums = aca58ca787ac3c2c44eea46b08a5a3c1
-	md5sums = f99eb141eecc4b9dd188d6819d741546
-	md5sums = 8ef8ab167d89ffa801e974722391d3c0
-	md5sums = 6325f0936f59420d33668754032141cb
+	sha256sums = ea9fe17fdb19cfe8a22e2b7859093f7a76eeaa51fd2571507b6dc37462515f21
+	sha256sums = f7aa055489f581e3da3001b23becef68586b0994da70ee138425926fc580b204
+	sha256sums = f9199b09981bb1fffba0f17a71e01021e4ea4aae6d99e553aa00c74d576e812b
+	sha256sums = 718378f2c3c42d56b916e9341e01261a2cfad5fb60ef15cc57954d1a4ce2a94e
+	sha256sums = e6654e29773b5ed01f897294ecbc21a84dcb59afc30cb60eb0d5a3c03c7d3de1
+	sha256sums = c9a701498a7b0f923182bf9f11aac8d2193026e509ae3643a5bc118b1a458c6b
+	sha256sums = 18b5e0b5dcbdce60e5f006e7995bc30c9ef7f606c2aa08c5f0a76eb6a6657ad0
+	sha256sums = 2f90dff20f2d3c0c47f17b3d6d45c4f0e7d27b986bf6084f21b85180cd1e03b4
 
 pkgname = doom3
 
diff --git a/.gitignore b/.gitignore
index e4f398dc5b3a..45886f85272d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,2 @@
-src/
-pkg/
-*.pkg.tar.xz
-*.pkg.tar
-*.src.tar.gz
+doom3-linux-1.3.1.1304.x86.run
+idtech4-doom3-source-GPL.zip
diff --git a/PKGBUILD b/PKGBUILD
index 7c7058f44a49..68e0d620272b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Contributor: Slash <demodevil5 [at] yahoo [dot] com>
+# Maintainer: Slash <demodevil5 [at] yahoo [dot] com>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 # Contributor: teddy_beer_maniac <teddy_beer_maniac@wp.pl>
 # Contributor: Babets
@@ -30,80 +30,81 @@ fi
 install=doom3.install
 source=('doom3.launcher' 'doom3-dedicated.launcher' 'doom3.desktop' \
     'doom3.launcher64' 'doom3-dedicated.launcher64' 'doom3.png' \
-    "http://pnfiles.gamespy.com/hostedftp/planetdoom/fms/files/other/38/idtech4doom3sourceGPL.zip" \
-    "http://www.1337-server.net/doom3/$pkgname-linux-$pkgver.x86.run")
+    "ftp://ftp.idsoftware.com/idstuff/source/idtech4-doom3-source-GPL.zip" \
+    "http://www.1337-server.net/doom3/${pkgname}-linux-${pkgver}.x86.run")
 provides=('doom3')
 conflicts=('doom3-bin' 'iodoom3' 'iodoom3-git' 'iodoom3-bin')
-md5sums=('da5f33feaa929c2c588a5a773c777e0f'
-         '6bdef1e111e5f450bca3f1c043caf4a2'
-         'facb0291279621d997f9504924d7e9b1'
-         '7ccbdd8f07672c6c34b2fe1de131e57c'
-         'aca58ca787ac3c2c44eea46b08a5a3c1'
-         'f99eb141eecc4b9dd188d6819d741546'
-         '8ef8ab167d89ffa801e974722391d3c0'
-         '6325f0936f59420d33668754032141cb')
+sha256sums=('ea9fe17fdb19cfe8a22e2b7859093f7a76eeaa51fd2571507b6dc37462515f21'
+            'f7aa055489f581e3da3001b23becef68586b0994da70ee138425926fc580b204'
+            'f9199b09981bb1fffba0f17a71e01021e4ea4aae6d99e553aa00c74d576e812b'
+            '718378f2c3c42d56b916e9341e01261a2cfad5fb60ef15cc57954d1a4ce2a94e'
+            'e6654e29773b5ed01f897294ecbc21a84dcb59afc30cb60eb0d5a3c03c7d3de1'
+            'c9a701498a7b0f923182bf9f11aac8d2193026e509ae3643a5bc118b1a458c6b'
+            '18b5e0b5dcbdce60e5f006e7995bc30c9ef7f606c2aa08c5f0a76eb6a6657ad0'
+            '2f90dff20f2d3c0c47f17b3d6d45c4f0e7d27b986bf6084f21b85180cd1e03b4')
 
 build() {
-    cd $srcdir/doom3.gpl/neo
+    cd "${srcdir}/doom3.gpl/neo"
 
     # Build Binaries from Source
     scons NOCURL=1 BUILD=release BUILD_GAMEPAK=1
 
-    cd $srcdir
+    cd "${srcdir}"
 
     # Make Installer Executable
-    chmod +x $srcdir/doom3-linux-$pkgver.x86.run
+    chmod +x "${srcdir}/doom3-linux-${pkgver}.x86.run"
 
     # Extract Game Files
-    ./doom3-linux-$pkgver.x86.run --tar xf
+    ./doom3-linux-${pkgver}.x86.run --tar xf
 }
 
 package() {
-    cd $srcdir
+    cd "${srcdir}"
 
     # Create Destination Directories
-    install -d $pkgdir/opt/doom3/{base,d3xp}
+    install -d "${pkgdir}/opt/doom3/"{base,d3xp}
 
     # Install Game Binaries
-    install -m 755 $srcdir/doom3.gpl/neo/doom.x86 \
-        $pkgdir/opt/doom3
+    install -m 755 "${srcdir}/doom3.gpl/neo/doom.x86" \
+        "${pkgdir}/opt/doom3"
 
     # Install Game Files
-    install -m 644 base/pak00*.pk4 $pkgdir/opt/doom3/base
-    install -m 644 d3xp/pak00*.pk4 $pkgdir/opt/doom3/d3xp
-    install -m 644 {CHANGES,README,version.info} $pkgdir/opt/doom3
-    install -m 644 $srcdir/doom3.gpl/neo/game01-base.pk4 \
-        $pkgdir/opt/doom3/base/game01.pk4
-    install -m 644 $srcdir/doom3.gpl/neo/game01-d3xp.pk4 \
-        $pkgdir/opt/doom3/d3xp/game01.pk4
+    install -m 644 base/pak00*.pk4 "${pkgdir}/opt/doom3/base"
+    install -m 644 d3xp/pak00*.pk4 "${pkgdir}/opt/doom3/d3xp"
+    install -m 644 {CHANGES,README,version.info} "${pkgdir}/opt/doom3"
+    install -m 644 "${srcdir}/doom3.gpl/neo/game01-base.pk4" \
+        "${pkgdir}/opt/doom3/base/game01.pk4"
+    install -m 644 "${srcdir}/doom3.gpl/neo/game01-d3xp.pk4" \
+        "${pkgdir}/opt/doom3/d3xp/game01.pk4"
 
     if [ "$CARCH" == "i686" ]; then
         # Install Game Launcher (Client)
-        install -D -m 755 $srcdir/doom3.launcher \
-            $pkgdir/usr/bin/doom3
+        install -D -m 755 "${srcdir}/doom3.launcher" \
+            "${pkgdir}/usr/bin/doom3"
 
         # Install Game Launcher (Server)
-        install -D -m 755 $srcdir/doom3-dedicated.launcher \
-            $pkgdir/usr/bin/doom3-dedicated
+        install -D -m 755 "${srcdir}/doom3-dedicated.launcher" \
+            "${pkgdir}/usr/bin/doom3-dedicated"
     else
         # Install Game Launcher (Client)
-        install -D -m 755 $srcdir/doom3.launcher64 \
-            $pkgdir/usr/bin/doom3
+        install -D -m 755 "${srcdir}/doom3.launcher64" \
+            "${pkgdir}/usr/bin/doom3"
 
         # Install Game Launcher (Server)
-        install -D -m 755 $srcdir/doom3-dedicated.launcher64 \
-            $pkgdir/usr/bin/doom3-dedicated
+        install -D -m 755 "${srcdir}/doom3-dedicated.launcher64" \
+            "${pkgdir}/usr/bin/doom3-dedicated"
     fi
 
     # Install License (DOOM 3)
-    install -D -m 644 $srcdir/License.txt \
-        $pkgdir/usr/share/licenses/$pkgname/license.txt
+    install -D -m 644 "${srcdir}/License.txt" \
+        "${pkgdir}/usr/share/licenses/${pkgname}/license.txt"
 
     # Install Icon
-    install -D -m 644 $srcdir/doom3.png \
-        $pkgdir/usr/share/pixmaps/doom3.png
+    install -D -m 644 "${srcdir}/doom3.png" \
+        "${pkgdir}/usr/share/pixmaps/doom3.png"
 
     # Install Desktop File
-    install -D -m 644 $srcdir/doom3.desktop \
-        $pkgdir/usr/share/applications/doom3.desktop
+    install -D -m 644 "${srcdir}/doom3.desktop" \
+        "${pkgdir}/usr/share/applications/doom3.desktop"
 }
+