[fix] Cleanup

4 files changed, 16 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e5c0a9788c98..e457103732b2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,17 @@
 pkgbase = alephone-eternalx
 	pkgdesc = A free scenario for Aleph One that continues the story of the Marathon trilogy
-	pkgver = 1.1.0b4
+	pkgver = 1.1.0
 	pkgrel = 1
 	url = http://eternal.bungie.org/
 	arch = any
 	license = unknown
 	depends = alephone
-	noextract = EternalXv110b4Full.zip
-	source = http://eternal.bungie.org/files/_releases/EternalXv110b4Full.zip
+	source = http://eternal.bungie.org/files/_releases/EternalXv110Full.zip
 	source = alephone-eternalx.sh
 	source = alephone-eternalx.desktop
-	sha256sums = d60caee357b59399dd9225895a3c6a5d76d68a75250afa48be113da1e23d4e6d
-	sha256sums = c627fdd3812a04d4de4a0249c5c560ba1089559fb0dfd0307192c6dc908c3d06
-	sha256sums = 729ea2e7a90a92a55fd47eae1568df72172f393370ceeabee657b378c663ec43
+	sha256sums = 74810c7bbc2442e9a953440f4b090507cbf1552bd64812a2edb2aa438c6bdf92
+	sha256sums = 367eac6d3652cb0aaa2d66c74770190d0e8eccfb8e46acf7fc991d652bfc70d0
+	sha256sums = 57dfa56c798a325f4a673d608c71dd5dda73c06270229b6bdf2379a06b9a1df0
 
 pkgname = alephone-eternalx
 
diff --git a/PKGBUILD b/PKGBUILD
index b8ece0b87b77..6f36ae4ba494 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: rabyte <rabyte__gmail>
 
 pkgname=alephone-eternalx
-pkgver=1.1.0b4
+pkgver=1.1.0
 pkgrel=1
 pkgdesc="A free scenario for Aleph One that continues the story of the Marathon trilogy"
 arch=('any')
@@ -12,23 +12,22 @@ depends=('alephone')
 source=("http://eternal.bungie.org/files/_releases/EternalXv${pkgver//./}Full.zip"
         "$pkgname.sh"
         "$pkgname.desktop")
-sha256sums=('d60caee357b59399dd9225895a3c6a5d76d68a75250afa48be113da1e23d4e6d'
-            'c627fdd3812a04d4de4a0249c5c560ba1089559fb0dfd0307192c6dc908c3d06'
-            '729ea2e7a90a92a55fd47eae1568df72172f393370ceeabee657b378c663ec43')
-noextract=("EternalXv${pkgver//./}Full.zip")
+sha256sums=('74810c7bbc2442e9a953440f4b090507cbf1552bd64812a2edb2aa438c6bdf92'
+            '367eac6d3652cb0aaa2d66c74770190d0e8eccfb8e46acf7fc991d652bfc70d0'
+            '57dfa56c798a325f4a673d608c71dd5dda73c06270229b6bdf2379a06b9a1df0')
 
 prepare() {
-  # circumvent bsdtar error and ignore Mac OS metadata
-  unzip -qo "EternalXv${pkgver//./}Full.zip" -x */.DS_Store __MACOSX/* -d eternalx
+  # remove Mac OS metadata
+  find "Eternal $pkgver" -name .DS_Store -delete
 }
 
 package() {
   # scenario data
-  install -d "$pkgdir"/usr/share/alephone/scenarios
-  cp -r eternalx "$pkgdir"/usr/share/alephone/scenarios/eternalx
+  install -d "$pkgdir"/usr/share/AlephOne/scenarios
+  cp -r "Eternal $pkgver" "$pkgdir"/usr/share/AlephOne/scenarios/eternalx
 
   # sane permissions
-  find "$pkgdir"/usr/share/alephone/scenarios/eternalx -type f -exec chmod 644 {} \;
+  find "$pkgdir"/usr/share/AlephOne/scenarios/eternalx -type f -exec chmod 644 {} \;
 
   # launcher script and .desktop file
   install -Dm755 $pkgname.sh "$pkgdir"/usr/bin/$pkgname
diff --git a/alephone-eternalx.desktop b/alephone-eternalx.desktop
index d2d29836ffba..bdcb7c9361f4 100644
--- a/alephone-eternalx.desktop
+++ b/alephone-eternalx.desktop
@@ -4,4 +4,4 @@ Exec=alephone-eternalx
 Icon=alephone
 Name=Eternal X (Aleph One)
 Categories=Game;ActionGame;
-Comment=A FPS game
+Comment=An FPS game
diff --git a/alephone-eternalx.sh b/alephone-eternalx.sh
index 9afa2e47415c..c2549e894f5e 100644
--- a/alephone-eternalx.sh
+++ b/alephone-eternalx.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-export ALEPHONE_DATA=/usr/share/alephone:/usr/share/alephone/scenarios/eternalx
+export ALEPHONE_DATA=/usr/share/AlephOne:/usr/share/AlephOne/scenarios/eternalx
 
 exec /usr/bin/alephone "$@"