From 5075968f01d524927d6e4b53849f1e8f9e9468d7 Mon Sep 17 00:00:00 2001
From: Christopher Roy Bratusek <nano@jpberlin.de>
Date: Wed, 14 May 2014 21:08:06 +0200
Subject: [PATCH] mkwiimm: check if user has required patchimage.rc stuff set,
 if not fallback to non-automated mode.

---
 ChangeLog           |  5 ++---
 script.d/mkwiimm.sh | 11 ++++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6643cd1..278230e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,9 +14,8 @@ v4.94:
 		other languages to german or english
 	MKWIIMM_SHARE_SAVE	either 1=ja (yes) or 2=nein (no)
 		whether to share save with the original game
-  YOU MUST SET THOSE VAlUES (patchimage will tell Wiimm's patcher to use
-  them and thus allows full automatic creating of mkwiimm without any
-  further user interaction needed). See README.RC for example config.
+  if you set them they will be applied for all mkwiimm patchers and no
+  further user interactions with the wiimm patcher is needed.
 
 v4.93:
 - various fixups
diff --git a/script.d/mkwiimm.sh b/script.d/mkwiimm.sh
index 7a035f5..9c2e273 100644
--- a/script.d/mkwiimm.sh
+++ b/script.d/mkwiimm.sh
@@ -72,14 +72,19 @@ build_mkwiimm () {
 
 		cp -r ${PATCHIMAGE_SCRIPT_DIR}/../override/* ${PWD}/bin/
 
-		echo "LANGUAGE=${MKWIIMM_GAME_LANG}
+		if [[ ${MKWIIMM_GAME_LANG} && ${MKWIIMM_MSG_LANG} && ${MKWIIMM_MKWIIMM_OWN_SAVE} ]]; then
+			echo "LANGUAGE=${MKWIIMM_GAME_LANG}
 MSGLANG=${MKWIIMM_MSG_LANG}
 ISOMODE=wbfs
 SPLITISO=
 PRIV_SAVEGAME=${MKWIIMM_OWN_SAVE}" > ${PWD}/config.def
 
-		echo "creating >${DIST}<, stand by..."
-		./create-image.sh -a --dest=${PWD}/RMC${REG}${ID}.wbfs >/dev/null
+			echo "creating >${DIST}<, stand by..."
+			./create-image.sh -a --dest=${PWD}/RMC${REG}${ID}.wbfs >/dev/null
+		else
+			echo "creating >${DIST}<"
+			./create-image.sh --dest=${PWD}/RMC${REG}${ID}.wbfs
+		fi
 
 		echo "patching >${DIST}< to use custom server..."
 		${WIT} cp ${PWD}/RMC${REG}${ID}.wbfs --DEST \