Fix installation and add some improvements.

3 files changed, 24 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 25e2dff34824..5d86b67cf023 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Mon Oct  2 19:45:42 UTC 2017
 pkgbase = retroarch-session
-	pkgdesc = Start retroarch via login manager as wayland or X11 session and shutdown the system when retroarch is closed.
-	pkgver = 0.1
-	pkgrel = 3
+	pkgdesc = Start retroarch via login manager as wayland or X11 session.
+	pkgver = 0.2
+	pkgrel = 1
 	arch = any
 	license = GPL
 	depends = xorg-xset
@@ -12,8 +10,7 @@ pkgbase = retroarch-session
 	source = retroarch-session.sh
 	source = retroarch-xorg.desktop
 	sha256sums = 5728b7bd4c113f995608912d91ce9a6fea271b7feea8542e617512a7d3718813
-	sha256sums = 480e4ceeadee3defdbb7f723a29efb9df858fb98541bf7db0d26b35c76cf2788
+	sha256sums = 3345b9a96121a767c835349218fd96220a973e370a2519f6a7035f3f1fceab5b
 	sha256sums = f91f69f146fa216a9480eadf583748eb444a7d387dc5d4357bd7d2cd5030bdae
 
 pkgname = retroarch-session
-
diff --git a/PKGBUILD b/PKGBUILD
index c972f9c37d36..46b43516adb4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,24 @@
-# Maintainer: Marcel Hoppe <hoppe.marcel@gmail.com>
+# Maintainer: Patrick Northon <northon_patrick3@yahoo.ca>
+# Contributor: Marcel Hoppe <hoppe.marcel@gmail.com>
 
 pkgname=retroarch-session
-pkgbase=${pkgname}
-pkgver=0.1
-pkgrel=3
-pkgdesc='Start retroarch via login manager as wayland or X11 session and shutdown the system when retroarch is closed.'
+pkgver=0.2
+pkgrel=1
+pkgdesc='Start retroarch via login manager as wayland or X11 session.'
 arch=('any')
 source=('retroarch.desktop'
         'retroarch-session.sh'
         'retroarch-xorg.desktop')
 sha256sums=('5728b7bd4c113f995608912d91ce9a6fea271b7feea8542e617512a7d3718813'
-            '480e4ceeadee3defdbb7f723a29efb9df858fb98541bf7db0d26b35c76cf2788'
+            '3345b9a96121a767c835349218fd96220a973e370a2519f6a7035f3f1fceab5b'
             'f91f69f146fa216a9480eadf583748eb444a7d387dc5d4357bd7d2cd5030bdae')
 license=('GPL')
 depends=('xorg-xset' 'retroarch')
 
 package() {
-  install -D -m644 "$srcdir"/../retroarch.desktop       "$pkgdir"/usr/share/wayland-sessions/retroarch.desktop
-  install -D -m644 "$srcdir"/../retroarch.desktop       "$pkgdir"/usr/share/xsessions/retroarch.desktop
-  install -D -m644 "$srcdir"/../retroarch-xorg.desktop  "$pkgdir"/usr/share/xsessions/retroarch-xorg.desktop
-  install -D -m755 "$srcdir"/../retroarch-session.sh    "$pkgdir"/usr/bin/retroarch-session.sh
+  install -d -m755 "$pkgdir/etc/retroarch-session"
+  install -D -m644 retroarch.desktop       "$pkgdir"/usr/share/wayland-sessions/retroarch.desktop
+  install -D -m644 retroarch.desktop       "$pkgdir"/usr/share/xsessions/retroarch.desktop
+  install -D -m644 retroarch-xorg.desktop  "$pkgdir"/usr/share/xsessions/retroarch-xorg.desktop
+  install -D -m755 retroarch-session.sh    "$pkgdir"/usr/bin/retroarch-session.sh
 }
diff --git a/retroarch-session.sh b/retroarch-session.sh
index 2389a7ec88ae..612904547a94 100755
--- a/retroarch-session.sh
+++ b/retroarch-session.sh
@@ -1,14 +1,17 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
-/usr/bin/xset s off         # don't activate screensaver
-/usr/bin/xset -dpms         # disable DPMS (Energy Star) features.
-/usr/bin/xset s noblank     # don't blank the video device
+xset s off         # don't activate screensaver
+xset -dpms         # disable DPMS (Energy Star) features.
+xset s noblank     # don't blank the video device
 
 #LOG="/var/log/retroarch/retroarch.log"
 
 #touch "$LOG"
 #mv "$LOG" "$LOG.old"
 
-/usr/bin/retroarch #&> "$LOG"
+[ -f '/etc/retroarch-session/pre-launch' ] && . '/etc/retroarch-session/pre-launch'
 
-shutdown now
+retroarch #&> "$LOG"
+
+#shutdown now
+[ -f '/etc/retroarch-session/post-launch' ] && . '/etc/retroarch-session/post-launch'