for NSMBW character mods, Mario Kart Wii font, item and kart mods,

don't download the files from the interwebs, instead use files supplied
  and installed with patchimage

ChangeLog

@@ -40,6 +40,9 @@ v7.0.0:
 - when downloading covers for Wii games fail, retry with the US cover
 - don't re-download covers that already exist
 - don't re-download soundtracks that already exist
+- for NSMBW character mods, Mario Kart Wii font, item and kart mods,
+  don't download the files from the interwebs, instead use files supplied
+  and installed with patchimage
 
 ::game additions
 

Makefile

@@ -4,7 +4,7 @@ all:
 install:
 	mkdir -p $(DESTDIR)/usr/bin/
 	mkdir -p $(DESTDIR)/usr/share/patchimage/
-	cp -rv patches tools override script.d $(DESTDIR)/usr/share/patchimage/
+	cp -rv data database override patches script.d tools $(DESTDIR)/usr/share/patchimage/
 	install -m755 patchimage.sh $(DESTDIR)/usr/bin/patchimage
 
 uninstall:

script.d/mkwii/mkwiimm_fonts.sh

@@ -2,7 +2,6 @@
 
 GAME_TYPE="MKWIIMM"
 GAME_NAME="Mario Kart Wiimm"
-ITEMS_BASE="http://riivolution.nanolx.org/mkwiimm_fonts"
 FSZS="files/Scene/UI/Font.szs"
 
 show_notes () {
@@ -46,12 +45,9 @@ orig		Original Mario Kart Wii Font"
 	read FONT
 
 	if [[ ${FONT} != orig ]]; then
-		if [[ ! -f ${PATCHIMAGE_RIIVOLUTION_DIR}/mkwiimm_font_${FONT} ]]; then
-			wget -O ${PATCHIMAGE_RIIVOLUTION_DIR}/mkwiimm_font_${FONT} \
-				${ITEMS_BASE}/${FONT} &>/dev/null \
-				|| (echo "download of ${FONT} failed." \
-				&& rm ${PATCHIMAGE_RIIVOLUTION_DIR}/${FONT} \
-				&& exit 57)
+		if [[ ! -f ${PATCHIMAGE_DATA_DIR}/mkwiimm_fonts/${FONT} ]]; then
+			echo "Font ${FONT} unknown"
+			exit 75
 		fi
 	fi
 
@@ -73,7 +69,7 @@ build_mkwiimm () {
 	fi
 
 	echo "*** 7) replacing font"
-	cp "${PATCHIMAGE_RIIVOLUTION_DIR}"/mkwiimm_font_${FONT} workdir/${FSZS}
+	cp "${PATCHIMAGE_DATA_DIR}"/mkwiimm_fonts/${FONT} workdir/${FSZS}
 
 	echo "*** 8) rebuilding game"
 	echo "       (storing game in ${PATCHIMAGE_GAME_DIR}/${ID})"

script.d/mkwii/mkwiimm_items.sh

@@ -2,7 +2,6 @@
 
 GAME_TYPE="MKWIIMM"
 GAME_NAME="Mario Kart Wiimm"
-ITEMS_BASE="http://riivolution.nanolx.org/mkwiimm_items"
 CSZS="files/Race/Common.szs"
 CSZD="files/Race/Common.d"
 
@@ -93,11 +92,9 @@ download_items () {
 
 	for item in ${choosenitems[@]}; do
 		id=${item/*:}
-		if [[ ! -f ${PATCHIMAGE_RIIVOLUTION_DIR}/mkwiimm_item_${id} ]]; then
-			wget -O ${PATCHIMAGE_RIIVOLUTION_DIR}/mkwiimm_item_${id} \
-				${ITEMS_BASE}/${id} &>/dev/null \
-				|| (echo "download of ${id} failed." \
-				&& rm ${PATCHIMAGE_RIIVOLUTION_DIR}/${id})
+		if [[ ! -f ${PATCHIMAGE_DATA_DIR}/mkwiimm_items/${id} ]]; then
+			echo "unknown Item ${item}"
+			exit 75
 		fi
 	done
 
@@ -132,10 +129,8 @@ build_mkwiimm () {
 	for item in ${choosenitems[@]}; do
 		slot=${item/:*}
 		newi=${item/*:}
-		if [[ -f ${PATCHIMAGE_RIIVOLUTION_DIR}/mkwiimm_item_${newi} ]]; then
-			cp ${PATCHIMAGE_RIIVOLUTION_DIR}/mkwiimm_item_${newi} \
-				workdir/${CSZD}/${slot}
-		fi
+		cp ${PATCHIMAGE_DATA_DIR}/mkwiimm_items/${newi} \
+			workdir/${CSZD}/${slot}
 	done
 	${SZS} create -o workdir/${CSZD} -q || \
 		( echo "szs caught an error rebuilding common.szs" && exit 51 )

script.d/mkwii/mkwiimm_karts.sh

@@ -2,7 +2,6 @@
 
 GAME_TYPE="MKWIIMM"
 GAME_NAME="Mario Kart Wiimm"
-ITEMS_BASE="http://riivolution.nanolx.org/mkwiimm_karts"
 
 show_notes () {
 
@@ -70,12 +69,9 @@ download_wiimm () {
 		read KART
 
 		for kart in ${KART[@]}; do
-			if [[ ! -f ${PATCHIMAGE_RIIVOLUTION_DIR}/mkwiimm_kart_${kart} ]]; then
-				wget -O ${PATCHIMAGE_RIIVOLUTION_DIR}/mkwiimm_kart_${kart} \
-					${ITEMS_BASE}/${kart} &>/dev/null \
-					|| (echo "download of ${kart} failed." \
-					&& rm ${PATCHIMAGE_RIIVOLUTION_DIR}/${KART} \
-					&& exit 57)
+			if [[ ! -f ${PATCHIMAGE_DATA_DIR}/mkwiimm_karts/${kart} ]]; then
+				echo "unknown Kart ${kart}"
+				exit 75
 			fi
 		done
 		ask_slot
@@ -109,11 +105,11 @@ build_mkwiimm () {
 		source=${kart/*:}
 		dest=${kart/:*}
 		echo "       old: ${dest}.szs	new: ${source}"
-		cp "${PATCHIMAGE_RIIVOLUTION_DIR}"/mkwiimm_kart_${source} \
+		cp "${PATCHIMAGE_DATA_DIR}"/mkwiimm_karts/${source} \
 			workdir/files/Race/Kart/${dest}.szs
-		cp "${PATCHIMAGE_RIIVOLUTION_DIR}"/mkwiimm_kart_${source} \
+		cp "${PATCHIMAGE_DATA_DIR}"/mkwiimm_karts/${source} \
 			workdir/files/Race/Kart/${dest}_2.szs
-		cp "${PATCHIMAGE_RIIVOLUTION_DIR}"/mkwiimm_kart_${source} \
+		cp "${PATCHIMAGE_DATA_DIR}"/mkwiimm_karts/${source} \
 			workdir/files/Race/Kart/${dest}_4.szs
 	done
 

script.d/nsmbw/nsmbw_characters.sh

@@ -2,7 +2,6 @@
 
 GAME_TYPE="WII_GENERIC"
 GAME_NAME="New Super Mario Bros. Wii"
-ITEMS_BASE="http://riivolution.nanolx.org/nsmbw_characters"
 
 show_notes () {
 
@@ -56,12 +55,9 @@ pi_action () {
 		read PLAYERS
 
 		for player in ${PLAYERS[@]}; do
-			if [[ ! -f ${PATCHIMAGE_RIIVOLUTION_DIR}/nsmbw_player_${player} ]]; then
-				wget -O ${PATCHIMAGE_RIIVOLUTION_DIR}/nsmbw_player_${player} \
-					${ITEMS_BASE}/${player} &>/dev/null \
-					|| (echo "download of ${player} failed." \
-					&& rm ${PATCHIMAGE_RIIVOLUTION_DIR}/${player} \
-					&& exit 57)
+			if [[ ! -f "${PATCHIMAGE_DATA_DIR}"/nsmbw_characters/${player} ]]; then
+				echo "unkown character ${player}"
+				exit 75
 			fi
 			slot=$(gawk -F \: "/^${player}/"'{print $2}' ${PATCHIMAGE_DATABASE_DIR}/nsmbw_characters.db)
 			choosenplayers=( ${choosenplayers[@]} ${player}:${slot} )
@@ -88,7 +84,7 @@ pi_action () {
 
 	echo "*** 5) replacing characters"
 	for player in ${choosenplayers[@]}; do
-		cp "${PATCHIMAGE_RIIVOLUTION_DIR}"/nsmbw_player_${player/:*} \
+		cp "${PATCHIMAGE_DATA_DIR}"/nsmbw_characters/${player/:*} \
 			workdir/files/Object/${player/*:}
 	done