Merge pull request #151 from beaumanvienna/beta

Lintian Messages Reduced / Package checker bug fixed / PS3 hotplug support improved

XBMC-cfgs/extra/gp_autodetect_xbmc.sh

@@ -30,12 +30,15 @@ do
     echo "[begin:] PS3 / USB controller changed"
 
     #first attempt
-    service xboxdrv restart
-    echo "sending gamepad reconfiguration request"
-    killall xbmc.bin -SIGUSR1
-    
+    service xboxdrv stop
+    killall -9 xboxdrv
+    service xboxdrv start
+
     #second attempt
-    service xboxdrv restart
+    service xboxdrv stop
+    killall -9 xboxdrv
+    service xboxdrv start
+
     echo "sending gamepad reconfiguration request"
     killall xbmc.bin -SIGUSR1
 

XBMC-cfgs/extra/rescan

@@ -1,12 +1,12 @@
 #!/bin/bash
 ### BEGIN INIT INFO
 # Provides: rescan
-# Required-Start:    
-# Required-Stop:     
+# Required-Start: $remote_fs
+# Required-Stop: $remote_fs
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Start rescan
-# Short-Description: This script starts, stops or restarts /usr/share/applications/gp_autodetect_xbmc.sh from project RetroRig. For more information see there.
+# Description: This script starts, stops or restarts /usr/share/applications/gp_autodetect_xbmc.sh from project RetroRig. For more information see there.
 ### END INIT INFO
 #
 # Author:      beauman @ jc techno labs
@@ -99,6 +99,10 @@ case "$1" in
     $0 stop
     $0 start
     ;;
+  force-reload)
+    $0 stop
+    $0 start
+    ;;
   status)
     if rescanIsRunning; then
       echo "rescan is running"

init-scripts/ps3_usb_controller/xboxdrv

@@ -16,7 +16,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="XBOX Controller Service"
 NAME=xboxdrv
 DAEMON=/usr/bin/$NAME
-DAEMON_ARGS="-D -d --deadzone 4000 --dbus disabled --detach"
+DAEMON_ARGS="-D -d --dbus disabled --detach"
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 
@@ -52,6 +52,7 @@ do_stop()
 {
     start-stop-daemon -K -o -q -x $DAEMON
     sleep 1
+    killall -9 xboxdrv
 }
 
 case "$1" in

retrorig-setup.sh

@@ -167,7 +167,7 @@ if [ "$script_invoke_path" == "/usr/bin/retrorig-setup" ]; then
 
 	#install method via system folder
 
-	scriptdir=/usr/lib/RetroRig
+	scriptdir=/usr/share/RetroRig
 
 else
 

scriptmodules/helpers.shinc

@@ -1049,7 +1049,7 @@ function h_filechecker()
 
 function h_pkgcheck()
 {
-    PKG_OK=$($cmd_remove_pkg "$1" | egrep -w "Status|Package|Version")
+    PKG_OK=$($cmd_query_pkg "$1" | egrep -w "Status|Package|Version")
     echo "Checking for some pkg/lib: $PKG_OK"
     if [ "" == "$PKG_OK" ]; then
         echo "NOT INSTALLED: $1" >> "$rootdir/logs/debug.log"

scriptmodules/setup.shinc

@@ -531,18 +531,15 @@ function rrs_add_standard_repos()
 					echo "deb http://ppa.launchpad.net/beauman/retrorig/ubuntu trusty main" >\
 					  /etc/apt/sources.list.d/beauman-ubuntu-retrorig-trusty.list
 
-					echo "deb http://ppa.launchpad.net/beauman/retrorig-testing/ubuntu trusty main" >\
-					  /etc/apt/sources.list.d/beauman-ubuntu-retrorig-testing-trusty.list
-
 					echo "copying missing libraries for Ubuntu 14.10"
-					mkdir -p /usr/lib/RetroRig
-					cd /usr/lib/RetroRig
+					mkdir -p /usr/share/RetroRig
+					cd /usr/share/RetroRig
 					wget --tries=50 -P /tmp "http://www.libregeek.org/RetroRig/libs/libs.Ubuntu.14.10.tar.bz"
 					tar xvfj /tmp/libs.Ubuntu.14.10.tar.bz
 
-					echo "installing librariessystem wide"
+					echo "installing libraries system wide"
 					cd /etc/ld.so.conf.d/
-					echo /usr/lib/RetroRig > RetroRig.conf
+					echo /usr/share/RetroRig > RetroRig.conf
 					ldconfig
 
 #					TODO
@@ -554,7 +551,7 @@ function rrs_add_standard_repos()
 #					apt-get update
 #
 #					# remove supplemental libraries
-#					rm -rf /usr/lib/RetroRig
+#					rm -rf /usr/share/RetroRig
 #					rm /etc/ld.so.conf.d/RetroRig.conf
 #					ldconfig
 					;;
@@ -676,8 +673,8 @@ function rrs_software()
 	# install binaries
 	$cmd_install_pkg xboxdrv curl python-software-properties \
 	pkg-config software-properties-common dconf-tools jstest-gtk \
-	qjoypad sixad libusb-0.1-4 antimicro bluez getpos unclutter \
-	joydetect sudo
+	sixad libusb-0.1-4 antimicro bluez getpos unclutter \
+	joydetect sudo ttf-dejavu-core ttf-dejavu-core ttf-liberation
 
 	#wii motion support
 	$cmd_install_pkg libcwiid1 lswm wmgui wminput
@@ -755,26 +752,28 @@ function rrs_debug()
 	gsettings list-recursively "org.gnome.desktop.screensaver" | grep "ubuntu-lock-on-suspend" >> "$rootdir/logs/debug.log"	
 	gsettings list-recursively "org.gnome.desktop.session" | grep "idle-delay" >> "$rootdir/logs/debug.log"
 
-	# Source built / pre-built
-	h_filechecker "$rootdir/emulators/PPSSPP/ppsspp-0.9.8-SDL-pk64"
-	h_filechecker "/ust/bin/PPSSPPSDL"
-
 	# pkg checks
-	echo -e "\nCheck for needed pkgs installed via apt: " >> "$rootdir/logs/debug.log"
+	echo -e "\nCheck for needed pkgs: " >> "$rootdir/logs/debug.log"
 	h_pkgcheck "stella"
+	h_pkgcheck "mednafen"
+	h_pkgcheck "mess"
+	h_pkgcheck "mame"
+	h_pkgcheck "ppsspp"
+	h_pkgcheck "dolphin-emu"
+	h_pkgcheck "mupen64plus"
+	h_pkgcheck "pcsx2"
+	h_pkgcheck "gens"
+
 	h_pkgcheck "python-software-properties"
 	h_pkgcheck "xbmc"
 	h_pkgcheck "dconf-tools"
 	h_pkgcheck "xboxdrv"
 	h_pkgcheck "curl"
-	h_pkgcheck "xbmc"
-	h_pkgcheck "mednafen"
-	h_pkgcheck "mess"
-	h_pkgcheck "mame"
-	h_pkgcheck "qjoypad"
+	h_pkgcheck "getpos"
 	h_pkgcheck "jstest-gtk"
+	h_pkgcheck "antimicro"
 
-   	echo -e "\nEnd of log file" >> "$rootdir/logs/debug.log" >> "$rootdir/logs/debug.log"
+	echo -e "\nEnd of log file" >> "$rootdir/logs/debug.log" >> "$rootdir/logs/debug.log"
 
 	dialog --backtitle "LibreGeek.org - RetroRig Setup. Installation folder: $rootdir for user $	user" --msgbox "Debug log was generated in $rootdir/logs/debug.log. Additional logs can be found in the folder $rootdir/logs/." 10 60 
 
@@ -960,7 +959,7 @@ function rrs_done()
 	# Please see commit efeb2bd for legacy code. This message will be 
 	# Removed in due time.
 
-       	dialog --backtitle "LibreGeek.org - RetroRig Setup. Installation folder: $rootdir for user $user" --msgbox "Finished main install tasks.\n\nYou now have to copy roms to the roms folders. \nThis can be done via SSH, Samba, or via your graphic folder manager (please see settings menu for more)\n\nAll current config folders used were appended with .old for restoration purposes.\n\n" 18 50
+       	dialog --backtitle "LibreGeek.org - RetroRig Setup. Installation folder: $rootdir for user $user" --msgbox "Finished main install tasks.\n\nYou now have to copy roms to the roms folders. \nThis can be done via SSH, Samba, or via your graphic folder manager (please see settings menu for more)\n\nAll current config folders used were appended with .old for restoration purposes.\n\nDon't forget to install the latest graphics drivers. Oftentimes proprietary driver help to improve gaming performance." 18 50
 
 	# correct permissions
 	h_correct_perms