Merge pull request #563 from fewtarius/dev

Bug fixes

packages/games/emulators/pcsx2sa/sources/start_pcsx2.sh

@@ -5,10 +5,10 @@
 . /etc/profile
 
 ARG=${1//[\\]/}
-set_audio alsa
-export SDL_AUDIODRIVER=alsa
+set_audio pulseaudio
 if [ ! -d "/storage/.config/PCSX2" ]
 then
   cp -rf /usr/config/PCSX2 /storage/.config
 fi
 ${FAST_CORES} @APPIMAGE@ "$ARG"
+set_audio alsa

packages/jelos/sources/autostart/common/003-mount_games

@@ -18,7 +18,7 @@ then
 fi
 
 mount_games() {
-      NULL=$(cat /proc/mounts | grep -v -e "/var/media" >/dev/null 2>&1 | grep ${1})
+      NULL=$(cat /proc/mounts | grep -v -e "/var/media" -e "/storage" >/dev/null 2>&1 | grep ${1})
       if [ ! "$?" = "0" ] && [ -e "${1}" ] && [ ! -e "/storage/.please_resize_me" ]
       then
         mount ${1} /storage/roms >/dev/null 2>&1
@@ -47,7 +47,7 @@ find_games() {
         continue
       fi
       # Udevil might mount it, and we shouldn't care if it does.
-      NULL=$(cat /proc/mounts | grep -v -e "/var/media" >/dev/null 2>&1 | grep ${DEV})
+      NULL=$(cat /proc/mounts | grep -v -e "/var/media" -e "/storage" >/dev/null 2>&1 | grep ${DEV})
       if [ ! "$?" = "0" ] && [ -e "${DEV}" ] && [ ! -e "/storage/.please_resize_me" ]
       then
         GAMES_DEVICE=${DEV}

packages/ui/emulationstation/package.mk

@@ -90,9 +90,6 @@ makeinstall_target() {
 	rm -rf ${INSTALL}/usr/config/emulationstation/resources/logo.png
 
         mkdir -p ${INSTALL}/usr/bin
-	cp ${PKG_BUILD}/es_settings ${INSTALL}/usr/bin
-	chmod 0755 ${INSTALL}/usr/bin/es_settings
-
 	cp ${PKG_BUILD}/start_es.sh ${INSTALL}/usr/bin
 	chmod 0755 ${INSTALL}/usr/bin/start_es.sh
 

packages/ui/emulationstation/sources/es_settings

@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2019-present Shanti Gilbert (https://github.com/shantigilbert)
-# Copyright (C) 2020-present Fewtarius
-
-# Source predefined functions and variables
-. /etc/profile
-
-set_audio alsa
-export SDL_AUDIODRIVER=alsa
-
-TZ=$(get_setting system.timezone)
-echo -n "TIMEZONE=${TZ}" > /storage/.cache/timezone
-echo -n "${TZ}" >/storage/.cache/system_timezone
-systemctl restart tz-data.service
-
-# create charmap used for translations
-locale=$(get_setting system.language)
-if [ $? == "0" ]
-then
-  charmap="UTF-8"
-  lang="${locale}.${charmap}"
-  locpath="/storage/.config/emulationstation/locale"
-  i18npath="$locpath/i18n"
-  localepath="$locpath/$lang"
-
-  if [ ! -d $localepath ]; then
-    export I18NPATH=$i18npath
-    performance 
-    /usr/bin/localedef -f $charmap -i $locale $localepath
-    ${DEVICE_CPU_GOVERNOR}
-  fi
-
-  export LOCPATH=$locpath
-  export LANG=$lang
-  export LANGUAGE=$lang
-  systemctl import-environment LANG
-  systemctl import-environment LOCPATH
-  systemctl import-environment I18NPATH
-  systemctl import-environment LANGUAGE
-fi
-
-if [[ ! -f "/storage/.newcfg" ]]; then
-  touch /storage/.newcfg
-fi

packages/ui/emulationstation/sources/start_es.sh

@@ -40,8 +40,4 @@ then
   systemctl import-environment LANGUAGE
 fi
 
-if [[ ! -f "/storage/.newcfg" ]]; then
-  touch /storage/.newcfg
-fi
-
 emulationstation --log-path /var/log

packages/ui/emulationstation/system.d/emustation.service

@@ -5,8 +5,7 @@ ConditionPathExists=/var/lock/start.games
 [Service]
 Environment=HOME=/storage
 Environment=SDL_AUDIODRIVER=alsa
-ExecStartPre=/usr/bin/es_settings
-ExecStart=/usr/bin/emulationstation --log-path /var/log
+ExecStart=/usr/bin/start_es.sh
 KillMode=process
 TimeoutStopSec=3
 Restart=always