Updated + made PKGBUILD more clear

2 files changed, 28 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b2b7b227c192..4c1fcdcd976f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
 pkgbase = rcr
 	pkgdesc = Red Crucible®: Reloaded - Free to play online FPS
-	pkgver = 1.4.0.1181
+	pkgver = 1.4.2.1198
 	pkgrel = 1
 	url = http://www.rocketeergames.com/site/rcr/
 	arch = i686
 	arch = x86_64
 	license = LLC
-	makedepends = unzip
 	source = http://cdn.rocketeergames.com/rcreloaded/redcrucible_lin.zip
 	source = rcr.desktop
-	md5sums = 2765858f674070973887ece5b6bfda5a
+	md5sums = 9e48a93d4dbc604e1d27464cfcf8383f
 	md5sums = b03e6aadb89d013092b10666bfbb9460
 
 pkgname = rcr
diff --git a/PKGBUILD b/PKGBUILD
index fcb9a10521f6..08fd69819309 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,45 @@
 # Maintainer: Erikas Rudinskas <erikmnkl@gmail.com>
 
 pkgname=rcr
-pkgver=1.4.0.1181
+pkgver=1.4.2.1198
 pkgrel=1
 pkgdesc="Red Crucible®: Reloaded - Free to play online FPS"
 arch=('i686' 'x86_64')
 url="http://www.rocketeergames.com/site/rcr/"
 license=('LLC')
 # depends=()
-makedepends=('unzip')
+# makedepends=()
 source=("http://cdn.rocketeergames.com/rcreloaded/redcrucible_lin.zip" "rcr.desktop")
-md5sums=('2765858f674070973887ece5b6bfda5a' 'b03e6aadb89d013092b10666bfbb9460')
+md5sums=('9e48a93d4dbc604e1d27464cfcf8383f' 'b03e6aadb89d013092b10666bfbb9460')
 
 package() {
-	mkdir -p "${pkgdir}/opt/rcr"
-	unzip "$srcdir/redcrucible_lin.zip" -d "${pkgdir}/opt/rcr"
 
-	# Remove unneeded files:
+	msg2 "Removing different architectures files..."
 	if [ "$CARCH" = "x86_64" ]; then
-		rm -f "${pkgdir}/opt/rcr/Red Crucible Reloaded.x86"
-		rm -rf "${pkgdir}/opt/rcr/Red Crucible Reloaded_Data/Plugins/x86"
-		rm -rf "${pkgdir}/opt/rcr/Red Crucible Reloaded_Data/Mono/x86"
+		rm -f  "${srcdir}/Red Crucible Reloaded.x86"
+		rm -rf "${srcdir}/Red Crucible Reloaded_Data/Plugins/x86"
+		rm -rf "${srcdir}/Red Crucible Reloaded_Data/Mono/x86"
 	else
-		rm -f "${pkgdir}/opt/rcr/Red Crucible Reloaded.x86_64"
-		rm -rf "${pkgdir}/opt/rcr/Red Crucible Reloaded_Data/Plugins/x86_64"
-		rm -rf "${pkgdir}/opt/rcr/Red Crucible Reloaded_Data/Mono/x86_64"
+		rm -f  "${srcdir}/Red Crucible Reloaded.x86_64"
+		rm -rf "${srcdir}/Red Crucible Reloaded_Data/Plugins/x86_64"
+		rm -rf "${srcdir}/Red Crucible Reloaded_Data/Mono/x86_64"
 	fi
 
-	# Desktop launcher with icon:
-	install -D -m644 "${srcdir}/rcr.desktop" "${pkgdir}/usr/share/applications/rcr.desktop"
-	install -D -m644 "${pkgdir}/opt/rcr/Red Crucible Reloaded_Data/Resources/UnityPlayer.png" "${pkgdir}/usr/share/pixmaps/rcr.png"
+	# Define my architecture (32bit named as "x86" and not "i686"):
+	if [ "$CARCH" = "x86_64" ] ; then MYARCH="x86_64" ; else MYARCH="x86" ; fi
 
-	# Make it launchable from CLI ("ln -s" doesn't work in this case):
-	mkdir -p "${pkgdir}/usr/bin"
-	if [ "$CARCH" = "x86_64" ]; then
-		echo "\"/opt/rcr/./Red Crucible Reloaded.x86_64\"" > "${pkgdir}/usr/bin/rcr"
-	else
-		echo "\"/opt/rcr/./Red Crucible Reloaded.x86\"" > "${pkgdir}/usr/bin/rcr"
-	fi
-	chmod 0755 "${pkgdir}/usr/bin/rcr"
+    msg2 "Installing files..."
+
+    # System files:
+    install -D -m644 "${srcdir}/rcr.desktop" "${pkgdir}/usr/share/applications/rcr.desktop"
+    install -D -m644 "${srcdir}/Red Crucible Reloaded_Data/Resources/UnityPlayer.png" "${pkgdir}/usr/share/pixmaps/rcr.png"
+
+    # Application files:
+	install -D "${srcdir}/Red Crucible Reloaded.${MYARCH}" "${pkgdir}/opt/rcr/Red Crucible Reloaded.${MYARCH}"
+	cp -r "${srcdir}/Red Crucible Reloaded_Data" "${pkgdir}/opt/rcr/"
+	chmod -R 755 "${pkgdir}/opt/rcr"
+
+	# Make it launchable from CLI ("ln -s" doesn't work in our case):
+	echo "\"/opt/rcr/./Red Crucible Reloaded.${MYARCH}\"" > "${srcdir}/rcr_launcher"
+    install -D -m755 "${srcdir}/rcr_launcher" "${pkgdir}/usr/bin/rcr"
 }
\ No newline at end of file