realrtcw: use a dlagent for moddb

4 files changed, 67 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 50e4b6e6eef2..d1dac03a4eba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -21,17 +21,19 @@ pkgbase = realrtcw
 	depends = sdl2
 	depends = zlib
 	source = realrtcw-3.1n.tar.gz::https://github.com/wolfetplayer/RealRTCW/archive/a1344ab17a53bda530e1f34c1a80bca7afcadcf4.tar.gz
+	source = realrtcw-3.1n.zip::moddb://www.moddb.com/downloads/start/201571/all
+	source = realrtcw-3.1n-addons.zip::moddb://www.moddb.com/downloads/start/201574/all
 	source = realrtcw.png
 	source = realrtcw.launcher
 	source = realrtcw.desktop
 	source = moddb-downloader.sh
-	source = md5sums
 	md5sums = b0f5e7c4986f59ac28b0f78180f28988
+	md5sums = 53883daccf27e054469cc0657b049476
+	md5sums = 3de40b988223e22a88c2f3301fa590b5
 	md5sums = 19ef21acfceb965f36b53b70267641d1
 	md5sums = 7e3991e5f331662419ad1ed04e49366c
 	md5sums = 88752202a0da9bc9cb467b6f0f201132
-	md5sums = a1f0a2f813b6fa7943dd2d68822d2c5a
-	md5sums = 85c800cf5b8471dc0f0a49f432da24bc
+	md5sums = 26632b1ad221caf63399ce5f9c6c958b
 
 pkgname = realrtcw
 
diff --git a/PKGBUILD b/PKGBUILD
index 3694125d29f2..1d4a10de76db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,72 +12,76 @@ depends=('freetype2' 'graphite' 'harfbuzz' 'iortcw-data' 'libjpeg-turbo' 'libogg
 makedepends=('unzip')
 install='realrtcw.install'
 md5sums=('b0f5e7c4986f59ac28b0f78180f28988'
+  '53883daccf27e054469cc0657b049476'
+  '3de40b988223e22a88c2f3301fa590b5'
   '19ef21acfceb965f36b53b70267641d1'
   '7e3991e5f331662419ad1ed04e49366c'
   '88752202a0da9bc9cb467b6f0f201132'
-  'a1f0a2f813b6fa7943dd2d68822d2c5a'
-  '85c800cf5b8471dc0f0a49f432da24bc')
+  '26632b1ad221caf63399ce5f9c6c958b')
 _commit="a1344ab17a53bda530e1f34c1a80bca7afcadcf4"
 
+_mainid=201571
+_addonsid=201574
+
+DLAGENTS+=("moddb::${BASH_SOURCE[0]%/*}/moddb-downloader.sh %u %o")
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/wolfetplayer/RealRTCW/archive/${_commit}.tar.gz"
+  "${pkgname}-${pkgver}.zip::moddb://www.moddb.com/downloads/start/${_mainid}/all"
+  "${pkgname}-${pkgver}-addons.zip::moddb://www.moddb.com/downloads/start/${_addonsid}/all"
   "${pkgname}.png"
   "${pkgname}.launcher"
   "${pkgname}.desktop"
   moddb-downloader.sh
-  md5sums
 )
 
-prepare() {
-  cd ${srcdir}
-  chmod +x ./moddb-downloader.sh
-
-  ./moddb-downloader.sh \
-    "${pkgname}-${pkgver}.zip" \
-    "${pkgname}-${pkgver}-addons.zip"
-
-  md5sum -c md5sums
-
-  if [ $? != 0 ]; then
-    echo 'Checksums are not valid'
-    rm "${pkgname}-${pkgver}.zip" \
-      "${pkgname}-${pkgver}-addons.zip"
-    exit 1
-  fi
-
-  # Unzipping with flattened paths
-  unzip -jo "${pkgname}-${pkgver}.zip" -d paks
-  unzip -jo "${pkgname}-${pkgver}-addons.zip"
-}
-
 package() {
   cd "${srcdir}/RealRTCW-${_commit}"
 
   USE_INTERNAL_LIBS=0 \
-    COPYDIR="${pkgdir}/opt/realrtcw" \
+  COPYDIR=${pkgdir}/opt/realrtcw \
     make copyfiles
 
-  ln -s -r /opt/iortcw-data/pak0.pk3 "${pkgdir}/opt/realrtcw/main"
-  ln -s -r /opt/iortcw-data/sp_pak1.pk3 "${pkgdir}/opt/realrtcw/main"
-  ln -s -r /opt/iortcw-data/mp_pak0.pk3 "${pkgdir}/opt/realrtcw/main"
-
-  ln -s -r /opt/iortcw-data/mp_bin.pk3 "${pkgdir}/opt/realrtcw/main"
-  ln -s -r /opt/iortcw-data/mp_pak1.pk3 "${pkgdir}/opt/realrtcw/main"
-  ln -s -r /opt/iortcw-data/mp_pak2.pk3 "${pkgdir}/opt/realrtcw/main"
-  ln -s -r /opt/iortcw-data/mp_pak3.pk3 "${pkgdir}/opt/realrtcw/main"
-  ln -s -r /opt/iortcw-data/mp_pak4.pk3 "${pkgdir}/opt/realrtcw/main"
-  ln -s -r /opt/iortcw-data/mp_pak5.pk3 "${pkgdir}/opt/realrtcw/main"
-  ln -s -r /opt/iortcw-data/mp_pakmaps0.pk3 "${pkgdir}/opt/realrtcw/main"
-  ln -s -r /opt/iortcw-data/mp_pakmaps1.pk3 "${pkgdir}/opt/realrtcw/main"
-  ln -s -r /opt/iortcw-data/mp_pakmaps2.pk3 "${pkgdir}/opt/realrtcw/main"
-  ln -s -r /opt/iortcw-data/mp_pakmaps3.pk3 "${pkgdir}/opt/realrtcw/main"
-  ln -s -r /opt/iortcw-data/mp_pakmaps4.pk3 "${pkgdir}/opt/realrtcw/main"
-  ln -s -r /opt/iortcw-data/mp_pakmaps5.pk3 "${pkgdir}/opt/realrtcw/main"
-  ln -s -r /opt/iortcw-data/mp_pakmaps6.pk3 "${pkgdir}/opt/realrtcw/main"
-  ln -s -r /opt/iortcw-data/sp_pak2.pk3 "${pkgdir}/opt/realrtcw/main"
-  ln -s -r /opt/iortcw-data/sp_pak3.pk3 "${pkgdir}/opt/realrtcw/main"
-  ln -s -r /opt/iortcw-data/sp_pak4.pk3 "${pkgdir}/opt/realrtcw/main"
-
-  ln -s -r /opt/iortcw-data/openurl.sh "${pkgdir}/opt/realrtcw/openurl.sh"
+  ln -s -r /opt/iortcw-data/pak0.pk3 \
+    "${pkgdir}/opt/realrtcw/main"
+  ln -s -r /opt/iortcw-data/sp_pak1.pk3 \
+    "${pkgdir}/opt/realrtcw/main"
+  ln -s -r /opt/iortcw-data/mp_pak0.pk3 \
+    "${pkgdir}/opt/realrtcw/main"
+
+  ln -s -r /opt/iortcw-data/mp_bin.pk3 \
+    "${pkgdir}/opt/realrtcw/main"
+  ln -s -r /opt/iortcw-data/mp_pak1.pk3 \
+    "${pkgdir}/opt/realrtcw/main"
+  ln -s -r /opt/iortcw-data/mp_pak2.pk3 \
+    "${pkgdir}/opt/realrtcw/main"
+  ln -s -r /opt/iortcw-data/mp_pak3.pk3 \
+    "${pkgdir}/opt/realrtcw/main"
+  ln -s -r /opt/iortcw-data/mp_pak4.pk3 \
+    "${pkgdir}/opt/realrtcw/main"
+  ln -s -r /opt/iortcw-data/mp_pak5.pk3 \
+    "${pkgdir}/opt/realrtcw/main"
+  ln -s -r /opt/iortcw-data/mp_pakmaps0.pk3 \
+    "${pkgdir}/opt/realrtcw/main"
+  ln -s -r /opt/iortcw-data/mp_pakmaps1.pk3 \
+    "${pkgdir}/opt/realrtcw/main"
+  ln -s -r /opt/iortcw-data/mp_pakmaps2.pk3 \
+    "${pkgdir}/opt/realrtcw/main"
+  ln -s -r /opt/iortcw-data/mp_pakmaps3.pk3 \
+    "${pkgdir}/opt/realrtcw/main"
+  ln -s -r /opt/iortcw-data/mp_pakmaps4.pk3 \
+    "${pkgdir}/opt/realrtcw/main"
+  ln -s -r /opt/iortcw-data/mp_pakmaps5.pk3 \
+    "${pkgdir}/opt/realrtcw/main"
+  ln -s -r /opt/iortcw-data/mp_pakmaps6.pk3 \
+    "${pkgdir}/opt/realrtcw/main"
+  ln -s -r /opt/iortcw-data/sp_pak2.pk3 \
+    "${pkgdir}/opt/realrtcw/main"
+  ln -s -r /opt/iortcw-data/sp_pak3.pk3 \
+    "${pkgdir}/opt/realrtcw/main"
+  ln -s -r /opt/iortcw-data/sp_pak4.pk3 \
+    "${pkgdir}/opt/realrtcw/main"
+
+  ln -s -r /opt/iortcw-data/openurl.sh \
+    "${pkgdir}/opt/realrtcw/openurl.sh"
 
   # Installing RealRTCW pk3
   for i in paks/*.pk3; do
@@ -90,7 +94,7 @@ package() {
     "${pkgdir}/opt/realrtcw"
 
   # Modify Launcher Scripts
-  if [ "${CARCH}" = "x86_64" ]; then
+  if [ "$CARCH" = "x86_64" ]; then
     # x86_64 Systems
     TARGET=x86_64
   else
diff --git a/md5sums b/md5sums
deleted file mode 100644
index bc5d485824dd..000000000000
--- a/md5sums
+++ /dev/null
@@ -1,2 +0,0 @@
-db1682d588cf8556b2574f435f1610e7 realrtcw-3.1n.zip
-da5b75e49061fb87f940dceaa10ca250 realrtcw-3.1n-addons.zip
diff --git a/moddb-downloader.sh b/moddb-downloader.sh
index d8739205324d..abb63e3c339c 100755
--- a/moddb-downloader.sh
+++ b/moddb-downloader.sh
@@ -1,14 +1,9 @@
-# An hardcoded stupid script to download from ModDB
-# Sorry no integrity check for now
-base="${1}"
-addons="${2}"
-_mainid=201571
-_addonsid=201574
-_urlmain=$(curl --silent https://www.moddb.com/downloads/start/${_mainid}/all | grep -Po '(?<=href="/)[^"]*' | head -1)
-_urladdons=$(curl --silent https://www.moddb.com/downloads/start/${_addonsid}/all | grep -Po '(?<=href="/)[^"]*' | head -1)
-echo "Downloading ${base}"
-curl -# -L -C - "https://www.moddb.com/${_urlmain}" -o \
-  "${base}"
-echo "Downloading ${addons}"
-curl -# -L -C - "https://www.moddb.com/${_urladdons}" -o \
-  "${addons}"
+# An script to download from ModDB
+
+url="${1}"
+output="${2}"
+resolved_url=$(curl --silent https://${url#moddb://} | grep -Po '(?<=href="/)[^"]*' | head -1)
+
+echo "Downloading ${output}"
+curl -L -C - "https://www.moddb.com/${resolved_url}" -o \
+  "${output}"