soh-otr-*: add --portVer

2 files changed, 16 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2abde6580e6e..911d5a5f0c4d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = soh-otr-n64_pal_10
 	pkgdesc = OTR game data for SoH (Ocarina of Time Europe PAL Version 1.0)
-	pkgver = 7.1.1.r97.g5ddc41877
+	pkgver = 7.1.1.r151.g8b78cb832
 	pkgrel = 1
 	epoch = 1
 	url = https://shipofharkinian.com/
diff --git a/PKGBUILD b/PKGBUILD
index 3502d61a54d3..cda37dab527f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 vername=N64_PAL_10
 verdesc="Ocarina of Time Europe PAL Version 1.0"
 pkgname=soh-otr-${vername,,}
-pkgver=7.1.1.r12.g8872a5928
+pkgver=7.1.1.r151.g8b78cb832
 pkgrel=1
 epoch=1   # For old versions of SoH, if available
 pkgdesc="OTR game data for SoH (${verdesc})"
@@ -17,6 +17,11 @@ source=("file://baserom.z64")
 sha256sums=('f29d21e10f77c44d933f07ff6d0f593d4267925f1e6834ce55e239b6037549e7')
 
 SHIP_PREFIX=/opt/soh
+OTRFILE=oot.otr
+
+_get_extractor_ver() {
+  pacman -Q soh-otr-exporter | sed -E 's/.* ((\.?[[:digit:]]*){3}).*$/\1/'
+}
 
 pkgver() {
   pacman -Q soh-otr-exporter | sed -E 's/.* (.*)-.*$/\1/'
@@ -25,17 +30,19 @@ pkgver() {
 build() {
   cd "${srcdir}"
 
-  [ -e oot.otr ] && rm oot.otr
+  [ -e "$OTRFILE" ] && rm "$OTRFILE"
+  [ -e assets ] && rm -rf assets
 
-  "${SHIP_PREFIX}/assets/extractor/ZAPD.out" ed -eh \
-    -i "${SHIP_PREFIX}/assets/extractor/xmls/${vername}" -b baserom.z64 \
-    -fl "${SHIP_PREFIX}/assets/extractor/filelists" -o . -osf . -gsf 0 \
-    -rconf "${SHIP_PREFIX}/assets/extractor/Config_${vername}.xml" -se OTR --otrfile oot.otr
+  cp -r "${SHIP_PREFIX}/assets" assets
+
+  "assets/extractor/ZAPD.out" ed -eh \
+    -i "assets/extractor/xmls/${vername}" -b baserom.z64 \
+    -fl "assets/extractor/filelists" -o . -osf . -gsf 0 \
+    -rconf "assets/extractor/Config_${vername}.xml" -se OTR --otrfile "$OTRFILE" --portVer "$(_get_extractor_ver)"
 }
 
 package() {
   cd "${srcdir}"
 
-  install -Dm644 oot.otr -t "${pkgdir}/${SHIP_PREFIX}"
+  install -Dm644 "$OTRFILE" -t "${pkgdir}/${SHIP_PREFIX}"
 }
-