Changes to be committed:

	modified:   PKGBUILD
	modified:   openjkmp.desktop
	modified:   openjksp.desktop

3 files changed, 35 insertions, 23 deletions

diff --git a/PKGBUILD b/PKGBUILD
index f5ddd4f6a6bb..8778421183c2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
-# Maintainer: Jameson Pugh <imntreal@gmail.com>
+# Maintainer: Pavel Lymarev <x-user at bk dot ru>
+# Contributor: Jameson Pugh <imntreal@gmail.com>
 # Contributor: Rene Schoebel (wesley) <schoebel.r at gmail dot com>
 
 pkgname=openjk-git
-pkgver=3303.2764ebc
+pkgver=3479.7b5f79ad
 pkgrel=1
 pkgdesc="Open Source Jedi Knight II + III Engine"
 arch=('i686' 'x86_64')
@@ -14,51 +15,64 @@ makedepends=('cmake' 'yasm' 'git')
 provides=(openjk)
 conflicts=(openjk)
 source=("openjk::git+https://github.com/JACoders/OpenJK.git"
-				'openjkmp.png'
-				'openjksp.png'
-				'openjkmp.desktop'
-				'openjksp.desktop')
+		'openjkmp.png'
+		'openjksp.png'
+		'openjkmp.desktop'
+		'openjksp.desktop')
 sha256sums=('SKIP'
             '0e82e720777eeb2043c2c25cdbce702c6d4ca077543aedfe51e5c4e96cf03969'
-						'afb2c1a757720c70798e7f7218f823297a43bc61e0cb192e9443df67c2963903'
-						'404693bbffb680430f71552822e1c6d40cbf7f62634e0e4e2ba48a4867039627'
-						'6983fc2d29dc2159963d621d55698809882fed8d20c2ef279e34344ad86f2ee7')
+            'afb2c1a757720c70798e7f7218f823297a43bc61e0cb192e9443df67c2963903'
+            'd3ad7dd270e57d36a22caef21bff17f2eb4acb0ad9087f6a17ca4a0bf9c566fc'
+            'd03554bd926954218c243a1a97d39ea9700d064a2374f671249a533ebd970375')
 _jkarch=i386
 [ "$CARCH" == "x86_64" ] && {
         _jkarch=x86_64
 }
 
 pkgver() {
-  cd openjk
+	cd openjk
 	echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
 }
 
 build() {
-  cd "${srcdir}/openjk"
+	cd "${srcdir}/openjk"
 
-  mkdir -p build
-  cd build
-  cmake ../ \
+	mkdir -p build
+	cd build
+	cmake ../ \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/opt/${pkgname} \
 		-DCMAKE_SIZEOF_VOID_P=4
-  make
+	make
 }
 
 package() {
-  cd "${srcdir}/openjk/build"
+	cd "${srcdir}/openjk/build"
 
 	make DESTDIR="${pkgdir}" install
 
 	mkdir -p "${pkgdir}/usr/bin"
-	ln -s "/opt/${pkgname}/JediAcademy/openjk.${_jkarch}" "${pkgdir}/usr/bin/openjk"
-	ln -s "/opt/${pkgname}/JediAcademy/openjk_sp.${_jkarch}" "${pkgdir}/usr/bin/openjk_sp"
-	ln -s "/opt/${pkgname}/JediAcademy/openjkded.${_jkarch}" "${pkgdir}/usr/bin/openjkded"
+	cat > ${pkgdir}/usr/bin/openjk << EOF
+#!/bin/bash
+cd /opt/${pkgname}/JediAcademy
+exec ./openjk.${_jkarch} $@
+EOF
+	chmod +x ${pkgdir}/usr/bin/openjk
+	cat > ${pkgdir}/usr/bin/openjk_sp << EOF
+#!/bin/bash
+cd /opt/${pkgname}/JediAcademy
+exec ./openjk_sp.${_jkarch} \$@
+EOF
+	chmod +x ${pkgdir}/usr/bin/openjk_sp
+	cat > ${pkgdir}/usr/bin/openjkded << EOF
+#!/bin/bash
+cd /opt/${pkgname}/JediAcademy
+exec ./openjkded.${_jkarch} \$@
+EOF
+	chmod +x ${pkgdir}/usr/bin/openjkded
 
 	install -Dm755 "${srcdir}/openjkmp.png" "${pkgdir}/usr/share/pixmaps/openjkmp.png"
 	install -Dm755 "${srcdir}/openjksp.png" "${pkgdir}/usr/share/pixmaps/openjksp.png"
 	install -Dm755 "${srcdir}/openjkmp.desktop" "${pkgdir}/usr/share/applications/openjkmp.desktop"
 	install -Dm755 "${srcdir}/openjksp.desktop" "${pkgdir}/usr/share/applications/openjksp.desktop"
 }
-
-# vim: set ts=2 sw=2 ft=sh noet:
diff --git a/openjkmp.desktop b/openjkmp.desktop
index b4b5a71f61b7..0c6eec115556 100644
--- a/openjkmp.desktop
+++ b/openjkmp.desktop
@@ -3,7 +3,6 @@ Encoding=UTF-8
 Type=Application
 Name=OpenJK Multi Player
 Comment="Open Source Jedi Knight II + III Engine - Multi Player"
-Path=/opt/openjk-git/JediAcademy/
 Exec=openjk
 Icon=openjkmp
 Terminal=false
diff --git a/openjksp.desktop b/openjksp.desktop
index 4013c8ce005b..e6adad93b3ae 100644
--- a/openjksp.desktop
+++ b/openjksp.desktop
@@ -3,7 +3,6 @@ Encoding=UTF-8
 Type=Application
 Name=OpenJK Single Player
 Comment="Open Source Jedi Knight II + III Engine - Single Player"
-Path=/opt/openjk-git/JediAcademy/
 Exec=openjk_sp
 Icon=openjksp
 Terminal=false