From 920e9b7dd7d1bc6520a3b445eca43eae9e3b3477 Mon Sep 17 00:00:00 2001
From: Christopher Roy Bratusek <nano@jpberlin.de>
Date: Sat, 11 Apr 2015 22:02:29 +0200
Subject: [PATCH] further MKWiimm tweaks

---
 ChangeLog           | 7 +++++--
 script.d/mkwiimm.sh | 9 ++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9a90c17..3fd709b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,14 +26,17 @@ v5.4.0:
 - add support for SMN?41 (Devil Mario Winter Special)
 - add support for SMN?31 (New Super Mario Bros. Wii - Other World)
 - add MKWIIMM_OVERRIDE_SZS variable to patchimage.rc
-  if set to TRUE patchimage will override the supplied SZS tools
+  If set to TRUE patchimage will override the supplied SZS tools
   of the MKWiimm patcher with it's own version of the tools.
   .
   This is useful when the supplied ones don't work with your system's
-  libpng (usually this happens on Debian GNU/Linux).
+  libpng (usually this happens on non-recent Debian GNU/Linux).
   .
   If patching anything older than RMCP23 (pre-wiimmfi versions) the tools
   will always be overriden (because they are ancient).
+  .
+  If creating anything newer than RMCP26 (2015 versions) the tools will
+  be never overriden (for now, does not work yet).
 
 v5.3.0:
 - update wit to 2.30a
diff --git a/script.d/mkwiimm.sh b/script.d/mkwiimm.sh
index 1b0c013..eabe098 100644
--- a/script.d/mkwiimm.sh
+++ b/script.d/mkwiimm.sh
@@ -8,7 +8,7 @@ show_notes () {
 
 echo -e \
 "************************************************
-${GAMENAME}
+${GAME_NAME}
 
 Custom Mario Kart Wii
 
@@ -87,8 +87,6 @@ build_mkwiimm () {
 				( echo "something went wrong extracting files" && exit 63 )
 		fi
 
-		XD=${PWD}
-
 		cd ${FILENAME/.7z}
 		ln -s ${IMAGE} .
 
@@ -101,7 +99,7 @@ build_mkwiimm () {
 		esac
 		chmod +x *.sh
 
-		if [[ ${MKWIIMM_OVERRIDE_SZS} == "TRUE" || ${MY_ID} -lt 23 ]]; then
+		if [[ (${MKWIIMM_OVERRIDE_SZS} == "TRUE" && ${MY_ID} -lt 27) || ${MY_ID} -lt 23 ]]; then
 			cp -r ${PATCHIMAGE_SCRIPT_DIR}/../override/* ${PWD}/bin/
 		fi
 
@@ -132,7 +130,7 @@ PRIV_SAVEGAME=${MKWIIMM_OWN_SAVE}" > ${PWD}/config.def
 		fi
 		echo "       ${DIST} saved as ${PATCHIMAGE_GAME_DIR}/RMC${REG}${MY_ID}.wbfs"
 		mv RMC${REG}${MY_ID}.wbfs \
-			${PATCHIMAGE_GAME_DIR}/RMC${REG}${MY_ID}.wbfs
+			${PATCHIMAGE_GAME_DIR}/RMC${REG}${MY_ID}.wbfs || exit 51
 
 		if [[ ${MY_ID} -lt 23 ]]; then
 			echo "*** 9) cleaning up workdir"
@@ -150,6 +148,7 @@ PRIV_SAVEGAME=${MKWIIMM_OWN_SAVE}" > ${PWD}/config.def
 
 patch_wiimm () {
 
+	XD=${PWD}
 	if [[ ${ID} == ALL ]]; then
 		for ID in {06..27}; do
 			build_mkwiimm ${ID}