From 411e2e7de2d2c041c4109d092fded562d5ab79eb Mon Sep 17 00:00:00 2001
From: sigurdb <sigurdb@redpill-linpro.com>
Date: Sun, 3 Mar 2019 13:58:57 +0100
Subject: [PATCH] Improve detection of DOSBox games, also removing exception
 for Shadow Warrior Classic Complete

---
 exceptions    | 8 --------
 pie-galaxy.sh | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/exceptions b/exceptions
index 4a158bd..00973b6 100644
--- a/exceptions
+++ b/exceptions
@@ -14,7 +14,6 @@ exceptionList=(
     1435827232 #Ultimate DOOM, The
     1207658753 #Teenagent
     1885026907 #Escape from Monkey Island
-    1207659142 #Shadow Warrior Complete
 )
 
 1435827232_exception() { #Ultimate DOOM, The
@@ -64,10 +63,3 @@ _EOF_
     )
     _msgbox "${gameName} Has been installed to ${romdir}/"
 }
-
-1207659142_exception() { #Shadow Warrior Complete
-    mv -f "${tmpdir}/${gameName}" "${dosboxdir}/${gameName}" || { _error "Uname to copy game to ${dosboxdir}\n\nThis is likely due to DOSBox not being installed."; return; }
-    cd "${romdir}/pc" || _error "unable to access ${romdir}/pc\nFailed to create launcher."
-    ln -s "${scriptdir}/dosbox-launcher.sh" "${gameName}.sh" || _error "Failed to create launcher."
-    _msgbox "GOG.com game ID: ${gameID}\n$(basename "${fileSelected}") was extracted and installed to ${dosboxdir}" --title "${gameName} was installed."
-}
\ No newline at end of file
diff --git a/pie-galaxy.sh b/pie-galaxy.sh
index c524761..fbf603e 100755
--- a/pie-galaxy.sh
+++ b/pie-galaxy.sh
@@ -227,7 +227,7 @@ _getType() {
 	local gamePath type
 	gamePath=$(cat "${tmpdir}/${1}/"goggame-*.info | jq --raw-output '.playTasks[] | select(.isPrimary==true) | .path')
 
-	if [[ "${gamePath}" == *"DOSBOX"* ]]; then
+	if [[ "${gamePath}" == *"DOSBOX"* ]] || [[ -d "${tmpdir}/${1}/DOSBOX" ]]; then
 		type="dosbox"
 	elif [[ "${gamePath}" == *"scummvm"* ]]; then
 		type="scummvm"