From 79e9767068253c5087659c89b71521ba85a4fd1e Mon Sep 17 00:00:00 2001 From: Christopher Roy Bratusek Date: Thu, 4 Aug 2016 20:28:09 +0200 Subject: [PATCH] - add PATCHIMAGE_DATABASE_DIR new internal variable - add PATCHIMAGE_OVERRIDE_DIR new internal variable - shift around some paths - update database with New Super Mario Bros. Wii mods --- ChangeLog | 6 +- {script.d => database}/mkwiimm.db | 0 {script.d => database}/mkwiimm_characters.db | 0 {script.d => database}/mkwiimm_fonts.db | 0 {script.d => database}/mkwiimm_items.db | 0 {script.d => database}/mkwiimm_karts.db | 0 {script.d => database}/mkwiimm_vehicles.db | 0 {script.d => database}/nsmbw.db | 15 ++-- {script.d => database}/nsmbw_characters.db | 0 {script.d => database}/titles.db | 0 {script.d => database}/wfc.db | 0 patchimage.sh | 84 ++++++++++--------- script.d/common.sh | 8 +- script.d/{ => mkwii}/mkwiimm.sh | 10 +-- script.d/{ => mkwii}/mkwiimm_fonts.sh | 2 +- script.d/{ => mkwii}/mkwiimm_items.sh | 2 +- script.d/{ => mkwii}/mkwiimm_karts.sh | 6 +- script.d/{ => mkwii}/wiimmfi.sh | 0 script.d/{ => nsmbw}/anothersmb.sh | 0 script.d/{ => nsmbw}/awesomersuperluigi.sh | 0 script.d/{ => nsmbw}/cannon.sh | 0 script.d/{ => nsmbw}/darkumbrasmb.sh | 0 .../{ => nsmbw}/devilmariowinterspecial.sh | 0 script.d/{ => nsmbw}/epicbowserworld.sh | 0 .../{ => nsmbw}/ghostlysuperghostbooswii.sh | 0 script.d/{ => nsmbw}/koopacountry.sh | 0 script.d/{ => nsmbw}/luigissuperyoshibros.sh | 0 script.d/{ => nsmbw}/midissupermariowii.sh | 0 script.d/{ => nsmbw}/newerapocalypse.sh | 0 script.d/{ => nsmbw}/newerfallingleaf.sh | 0 script.d/{ => nsmbw}/newerholiday.sh | 0 script.d/{ => nsmbw}/newersmb.sh | 0 script.d/{ => nsmbw}/newersummersun.sh | 0 script.d/{ => nsmbw}/newsmbwotherworld.sh | 0 script.d/{ => nsmbw}/nsmbw3.sh | 0 script.d/{ => nsmbw}/nsmbw4.sh | 0 script.d/{ => nsmbw}/nsmbw_characters.sh | 4 +- .../{ => nsmbw}/remixedsupermariobroswii.sh | 0 script.d/{ => nsmbw}/retroremix.sh | 0 .../{ => nsmbw}/revisedsupermariobroswii.sh | 0 script.d/{ => nsmbw}/rvlution.sh | 0 script.d/{ => nsmbw}/skyland.sh | 0 script.d/{ => nsmbw}/summervacation.sh | 0 script.d/{ => nsmbw}/thelegendofyoshi.sh | 0 script.d/{ => pokemon}/pokemoneternalx.sh | 0 script.d/{ => pokemon}/pokemonneox.sh | 0 script.d/{ => pokemon}/pokemonneoy.sh | 0 script.d/{ => pokemon}/pokemonrisingruby.sh | 0 script.d/{ => pokemon}/pokemonrutileruby.sh | 0 .../{ => pokemon}/pokemonsinkingsapphire.sh | 0 script.d/{ => pokemon}/pokemonstarsapphire.sh | 0 script.d/{ => pokemon}/pokemonwiltingy.sh | 0 52 files changed, 74 insertions(+), 63 deletions(-) rename {script.d => database}/mkwiimm.db (100%) rename {script.d => database}/mkwiimm_characters.db (100%) rename {script.d => database}/mkwiimm_fonts.db (100%) rename {script.d => database}/mkwiimm_items.db (100%) rename {script.d => database}/mkwiimm_karts.db (100%) rename {script.d => database}/mkwiimm_vehicles.db (100%) rename {script.d => database}/nsmbw.db (64%) rename {script.d => database}/nsmbw_characters.db (100%) rename {script.d => database}/titles.db (100%) rename {script.d => database}/wfc.db (100%) rename script.d/{ => mkwii}/mkwiimm.sh (94%) rename script.d/{ => mkwii}/mkwiimm_fonts.sh (96%) rename script.d/{ => mkwii}/mkwiimm_items.sh (97%) rename script.d/{ => mkwii}/mkwiimm_karts.sh (92%) rename script.d/{ => mkwii}/wiimmfi.sh (100%) rename script.d/{ => nsmbw}/anothersmb.sh (100%) rename script.d/{ => nsmbw}/awesomersuperluigi.sh (100%) rename script.d/{ => nsmbw}/cannon.sh (100%) rename script.d/{ => nsmbw}/darkumbrasmb.sh (100%) rename script.d/{ => nsmbw}/devilmariowinterspecial.sh (100%) rename script.d/{ => nsmbw}/epicbowserworld.sh (100%) rename script.d/{ => nsmbw}/ghostlysuperghostbooswii.sh (100%) rename script.d/{ => nsmbw}/koopacountry.sh (100%) rename script.d/{ => nsmbw}/luigissuperyoshibros.sh (100%) rename script.d/{ => nsmbw}/midissupermariowii.sh (100%) rename script.d/{ => nsmbw}/newerapocalypse.sh (100%) rename script.d/{ => nsmbw}/newerfallingleaf.sh (100%) rename script.d/{ => nsmbw}/newerholiday.sh (100%) rename script.d/{ => nsmbw}/newersmb.sh (100%) rename script.d/{ => nsmbw}/newersummersun.sh (100%) rename script.d/{ => nsmbw}/newsmbwotherworld.sh (100%) rename script.d/{ => nsmbw}/nsmbw3.sh (100%) rename script.d/{ => nsmbw}/nsmbw4.sh (100%) rename script.d/{ => nsmbw}/nsmbw_characters.sh (92%) rename script.d/{ => nsmbw}/remixedsupermariobroswii.sh (100%) rename script.d/{ => nsmbw}/retroremix.sh (100%) rename script.d/{ => nsmbw}/revisedsupermariobroswii.sh (100%) rename script.d/{ => nsmbw}/rvlution.sh (100%) rename script.d/{ => nsmbw}/skyland.sh (100%) rename script.d/{ => nsmbw}/summervacation.sh (100%) rename script.d/{ => nsmbw}/thelegendofyoshi.sh (100%) rename script.d/{ => pokemon}/pokemoneternalx.sh (100%) rename script.d/{ => pokemon}/pokemonneox.sh (100%) rename script.d/{ => pokemon}/pokemonneoy.sh (100%) rename script.d/{ => pokemon}/pokemonrisingruby.sh (100%) rename script.d/{ => pokemon}/pokemonrutileruby.sh (100%) rename script.d/{ => pokemon}/pokemonsinkingsapphire.sh (100%) rename script.d/{ => pokemon}/pokemonstarsapphire.sh (100%) rename script.d/{ => pokemon}/pokemonwiltingy.sh (100%) diff --git a/ChangeLog b/ChangeLog index 723f25d..10f09a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,12 @@ v7.0.0: ::internal changes - add PATCHIMAGE_DIR new internal variable +- add PATCHIMAGE_DATABASE_DIR new internal variable +- add PATCHIMAGE_OVERRIDE_DIR new internal variable - add UNP_EXTRA_ARGS new internal variable -- make check_input_rom search in both ${PATCHIMAGE_3DS_DIR} and ${PWD} - make check_input_rom a common.sh function, prevent duplicated code +- shift around some paths +- update database with New Super Mario Bros. Wii mods ::bug fixes - before creating any of the directories defined in ${HOME}/.patchimage.rc @@ -31,6 +34,7 @@ v7.0.0: - now includes expected filenames ::misc. changes +- make check_input_rom search in both ${PATCHIMAGE_3DS_DIR} and ${PWD} - show full path for Hans Files for all games, instead of relative - only show path to Hans files if they exist - when downloading covers for Wii games fail, retry with the US cover diff --git a/script.d/mkwiimm.db b/database/mkwiimm.db similarity index 100% rename from script.d/mkwiimm.db rename to database/mkwiimm.db diff --git a/script.d/mkwiimm_characters.db b/database/mkwiimm_characters.db similarity index 100% rename from script.d/mkwiimm_characters.db rename to database/mkwiimm_characters.db diff --git a/script.d/mkwiimm_fonts.db b/database/mkwiimm_fonts.db similarity index 100% rename from script.d/mkwiimm_fonts.db rename to database/mkwiimm_fonts.db diff --git a/script.d/mkwiimm_items.db b/database/mkwiimm_items.db similarity index 100% rename from script.d/mkwiimm_items.db rename to database/mkwiimm_items.db diff --git a/script.d/mkwiimm_karts.db b/database/mkwiimm_karts.db similarity index 100% rename from script.d/mkwiimm_karts.db rename to database/mkwiimm_karts.db diff --git a/script.d/mkwiimm_vehicles.db b/database/mkwiimm_vehicles.db similarity index 100% rename from script.d/mkwiimm_vehicles.db rename to database/mkwiimm_vehicles.db diff --git a/script.d/nsmbw.db b/database/nsmbw.db similarity index 64% rename from script.d/nsmbw.db rename to database/nsmbw.db index d3fa176..a845c07 100644 --- a/script.d/nsmbw.db +++ b/database/nsmbw.db @@ -1,5 +1,4 @@ -SLF*01:NSMBW3 The Final Levels -SMN*01:Original New Super Mario Bros. Wii +SLF?01:NSMBW3: The Final Levels SMN*03:Newer Super Mario Bros. Wii SMN*04:Canon Super Mario Bros. Wii SMN*05:Another Super Mario Bros. Wii @@ -11,13 +10,17 @@ SMN*11:New Super Mario Bros. 4 SMN*12:Awesomer Super Luigi Mini SMN*31:New Super Mario Bros. Wii - Other World SMN*41:Devil Mario Winter Special +SMN*60:Remixed Super Mario Bros. Wii +SMN*65:Ghostly Super Ghost Boos. Wii +SMN*66:The Legend of Yoshi +SMN*69:Revised Super Mario Bros. Wii SMN*DU:DarkUmbra Super Mario Bros: Anniversary Edition -SMN*FL:Newer Falling Leaf +SMN*FL:Newer: Falling Leaf SMN*MI:Midi's Super Mario Bros Wii - Just A Little Adventure SMN*RV:RVLution Wii (NewSMB Mod) SMN*YL:Luigi's Super Yoshi Bros. SMN*ZA:Newer Apocalypse SMN*ZY:Super Mario Skyland -SMM*02:Super Mario Mushroom Adventure PLUS - Winter Moon -SMV*01:Super Mario Vacation -MRR*01:New Super Mario Bros. Wii Retro Remix +SMM?02:Super Mario: Mushroom Adventure PLUS - Winter Moon +SMV?01:Super Mario Vacation +MRR?01:New Super Mario Bros. Wii Retro Remix diff --git a/script.d/nsmbw_characters.db b/database/nsmbw_characters.db similarity index 100% rename from script.d/nsmbw_characters.db rename to database/nsmbw_characters.db diff --git a/script.d/titles.db b/database/titles.db similarity index 100% rename from script.d/titles.db rename to database/titles.db diff --git a/script.d/wfc.db b/database/wfc.db similarity index 100% rename from script.d/wfc.db rename to database/wfc.db diff --git a/patchimage.sh b/patchimage.sh index 66c616e..49eb912 100755 --- a/patchimage.sh +++ b/patchimage.sh @@ -16,11 +16,15 @@ if [[ -d ${basedir}/script.d ]]; then PATCHIMAGE_PATCH_DIR=${basedir}/patches PATCHIMAGE_DATA_DIR=${basedir}/data PATCHIMAGE_TOOLS_DIR=${basedir}/tools + PATCHIMAGE_OVERRIDE_DIR=${basedir}/override + PATCHIMAGE_DATABASE_DIR=${basedir}/database else PATCHIMAGE_SCRIPT_DIR=/usr/share/patchimage/script.d PATCHIMAGE_PATCH_DIR=/usr/share/patchimage/patches PATCHIMAGE_DATA_DIR=/usr/share/patchimage/data PATCHIMAGE_TOOLS_DIR=/usr/share/patchimage/tools + PATCHIMAGE_OVERRIDE_DIR=/usr/share/patchimage/override + PATCHIMAGE_DATABASE_DIR=/usr/share/patchimage/database fi PATCHIMAGE_RIIVOLUTION_DIR=${basedir} @@ -40,115 +44,115 @@ setup_tools case ${GAME} in NSMB1 | NewerSMB | NewerSMBW ) - source ${PATCHIMAGE_SCRIPT_DIR}/newersmb.sh + source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw/newersmb.sh ;; NSMB2 | NewerSummerSun ) - source ${PATCHIMAGE_SCRIPT_DIR}/newersummersun.sh + source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw/newersummersun.sh ;; NSMB3 | ASMBW | AnotherSMBW ) - source ${PATCHIMAGE_SCRIPT_DIR}/anothersmb.sh + source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw/anothersmb.sh ;; NSMB4 | HolidaySpecial | "Newer: Holiday Special" ) - source ${PATCHIMAGE_SCRIPT_DIR}/newerholiday.sh + source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw/newerholiday.sh ;; NSMB5 | Cannon | "Cannon SMBW" ) - source ${PATCHIMAGE_SCRIPT_DIR}/cannon.sh + source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw/cannon.sh ;; NSMB6 | ESBW | "Epic Super Bowser World" ) - source ${PATCHIMAGE_SCRIPT_DIR}/epicbowserworld.sh + source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw/epicbowserworld.sh ;; NSMB7 | Koopa | "Koopa Country" ) - source ${PATCHIMAGE_SCRIPT_DIR}/koopacountry.sh + source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw/koopacountry.sh ;; NSMB8 | "New Super Mario Bros. 4" ) - source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw4.sh + source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw/nsmbw4.sh ;; NSMB9 | Retro | "Retro Remix" ) - source ${PATCHIMAGE_SCRIPT_DIR}/retroremix.sh + source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw/retroremix.sh ;; NSMB10 | WinterMoon | "Super Mario: Mushroom Adventure PLUS - Winter Moon" ) - source ${PATCHIMAGE_SCRIPT_DIR}/wintermoon.sh + source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw/wintermoon.sh ;; NSMB11 | NSMBW3 | "NSMBW3: The Final Levels" ) - source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw3.sh + source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw/nsmbw3.sh ;; NSMB12 | SMV | "Super Mario Vacation" ) - source ${PATCHIMAGE_SCRIPT_DIR}/summervacation.sh + source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw/summervacation.sh ;; NSMB13 | ASLM | "Awesomer Super Luigi Mini" ) - source ${PATCHIMAGE_SCRIPT_DIR}/awesomersuperluigi.sh + source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw/awesomersuperluigi.sh ;; NSMB14 | Sykland ) - source ${PATCHIMAGE_SCRIPT_DIR}/skyland.sh + source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw/skyland.sh ;; NSMB15 | RVLution ) - source ${PATCHIMAGE_SCRIPT_DIR}/rvlution.sh + source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw/rvlution.sh ;; NSMB16 | Midi ) - source ${PATCHIMAGE_SCRIPT_DIR}/midissupermariowii.sh + source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw/midissupermariowii.sh ;; NSMB17 | DarkUmbra ) - source ${PATCHIMAGE_SCRIPT_DIR}/darkumbrasmb.sh + source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw/darkumbrasmb.sh ;; NSMB18 | NewerApocalypse ) - source ${PATCHIMAGE_SCRIPT_DIR}/newerapocalypse.sh + source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw/newerapocalypse.sh ;; NSMB19 | LuigisSuperYoshiBros ) - source ${PATCHIMAGE_SCRIPT_DIR}/luigissuperyoshibros.sh + source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw/luigissuperyoshibros.sh ;; NSMB20 | NewerFallingLeaf ) - source ${PATCHIMAGE_SCRIPT_DIR}/newerfallingleaf.sh + source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw/newerfallingleaf.sh ;; NSMB21 | DevilMarioWinterSpecial ) - source ${PATCHIMAGE_SCRIPT_DIR}/devilmariowinterspecial.sh + source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw/devilmariowinterspecial.sh ;; NSMB22 | NewSMBWOtherWorld ) - source ${PATCHIMAGE_SCRIPT_DIR}/newsmbwotherworld.sh + source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw/newsmbwotherworld.sh ;; NSMB23 | TheLegendOfYoshi ) - source ${PATCHIMAGE_SCRIPT_DIR}/thelegendofyoshi.sh + source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw/thelegendofyoshi.sh ;; NSMB24 | RemixedSuperMarioBrosWii ) - source ${PATCHIMAGE_SCRIPT_DIR}/remixedsupermariobroswii.sh + source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw/remixedsupermariobroswii.sh ;; NSMB25 | GhostlySuperGhostBoosWii ) - source ${PATCHIMAGE_SCRIPT_DIR}/ghostlysuperghostbooswii.sh + source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw/ghostlysuperghostbooswii.sh ;; NSMB26 | RevisedSuperMarioBrosWii ) - source ${PATCHIMAGE_SCRIPT_DIR}/revisedsupermariobroswii.sh + source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw/revisedsupermariobroswii.sh ;; NSMB99 | NSMBWCharacters ) - source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw_characters.sh + source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw/nsmbw_characters.sh ;; MKW1 | Wiimmfi ) - source ${PATCHIMAGE_SCRIPT_DIR}/wiimmfi.sh + source ${PATCHIMAGE_SCRIPT_DIR}/mkwii/wiimmfi.sh ;; MKW2 | Wiimmpatch ) @@ -156,19 +160,19 @@ case ${GAME} in ;; MKW3 | Mkwiimm ) - source ${PATCHIMAGE_SCRIPT_DIR}/mkwiimm.sh + source ${PATCHIMAGE_SCRIPT_DIR}/mkwii/mkwiimm.sh ;; MKW4 | MkwiimmItems ) - source ${PATCHIMAGE_SCRIPT_DIR}/mkwiimm_items.sh + source ${PATCHIMAGE_SCRIPT_DIR}/mkwii/mkwiimm_items.sh ;; MKW5 | MkwiimmFonts ) - source ${PATCHIMAGE_SCRIPT_DIR}/mkwiimm_fonts.sh + source ${PATCHIMAGE_SCRIPT_DIR}/mkwii/mkwiimm_fonts.sh ;; MKW6 | MkwiimmKarts ) - source ${PATCHIMAGE_SCRIPT_DIR}/mkwiimm_karts.sh + source ${PATCHIMAGE_SCRIPT_DIR}/mkwii/mkwiimm_karts.sh ;; KAW1 | Kirby ) @@ -180,35 +184,35 @@ case ${GAME} in ;; PKMN1 | NeoX ) - source ${PATCHIMAGE_SCRIPT_DIR}/pokemonneox.sh + source ${PATCHIMAGE_SCRIPT_DIR}/pokemon/pokemonneox.sh ;; PKMN2 | NeoY ) - source ${PATCHIMAGE_SCRIPT_DIR}/pokemonneoy.sh + source ${PATCHIMAGE_SCRIPT_DIR}/pokemon/pokemonneoy.sh ;; PKMN3 | RutileRuby ) - source ${PATCHIMAGE_SCRIPT_DIR}/pokemonrutileruby.sh + source ${PATCHIMAGE_SCRIPT_DIR}/pokemon/pokemonrutileruby.sh ;; PKMN4 | AlphaSapphire ) - source ${PATCHIMAGE_SCRIPT_DIR}/pokemonstarsapphire.sh + source ${PATCHIMAGE_SCRIPT_DIR}/pokemon/pokemonstarsapphire.sh ;; PKMN5 | EternalX ) - source ${PATCHIMAGE_SCRIPT_DIR}/pokemoneternalx.sh + source ${PATCHIMAGE_SCRIPT_DIR}/pokemon/pokemoneternalx.sh ;; PKMN6 | WiltingY ) - source ${PATCHIMAGE_SCRIPT_DIR}/pokemonwiltingy.sh + source ${PATCHIMAGE_SCRIPT_DIR}/pokemon/pokemonwiltingy.sh ;; PKMN7 | RisingRuby ) - source ${PATCHIMAGE_SCRIPT_DIR}/pokemonrisingruby.sh + source ${PATCHIMAGE_SCRIPT_DIR}/pokemon/pokemonrisingruby.sh ;; PKMN8 | SinkingSapphire ) - source ${PATCHIMAGE_SCRIPT_DIR}/pokemonsinkingsapphire.sh + source ${PATCHIMAGE_SCRIPT_DIR}/pokemon/pokemonsinkingsapphire.sh ;; BSECU | BravelySecondUncensored ) diff --git a/script.d/common.sh b/script.d/common.sh index a39604b..795b59c 100644 --- a/script.d/common.sh +++ b/script.d/common.sh @@ -321,7 +321,7 @@ show_nsmb_db () { ID1=${1:0:3} ID2=${1:4:2} gawk -F \: "/^${ID1}\*${ID2}/"'{print $2}' \ - < "${PATCHIMAGE_SCRIPT_DIR}"/nsmbw.db || echo "** Unknown **" + < "${PATCHIMAGE_DATABASE_DIR}"/nsmbw.db || echo "** Unknown **" } @@ -329,7 +329,7 @@ show_mkwiimm_db () { ID=${1:4:2} [[ ${ID} == [0-9][0-9] ]] && gawk -F \: "/^${ID}/"'{print $2}' \ - < "${PATCHIMAGE_SCRIPT_DIR}"/mkwiimm.db || echo "** Unknown **" + < "${PATCHIMAGE_DATABASE_DIR}"/mkwiimm.db || echo "** Unknown **" } @@ -369,14 +369,14 @@ show_titles_db () { ID=${1/.*} gawk -F \: "/^${ID}/"'{print $2}' \ - < "${PATCHIMAGE_SCRIPT_DIR}"/titles.db || echo "** Unknown **" + < "${PATCHIMAGE_DATABASE_DIR}"/titles.db || echo "** Unknown **" } check_wfc () { ID=${1/.*} - if [[ $(grep ${ID} "${PATCHIMAGE_SCRIPT_DIR}"/wfc.db) ]]; then + if [[ $(grep ${ID} "${PATCHIMAGE_DATABASE_DIR}"/wfc.db) ]]; then echo TRUE else echo FALSE diff --git a/script.d/mkwiimm.sh b/script.d/mkwii/mkwiimm.sh similarity index 94% rename from script.d/mkwiimm.sh rename to script.d/mkwii/mkwiimm.sh index 7926172..26f103e 100644 --- a/script.d/mkwiimm.sh +++ b/script.d/mkwii/mkwiimm.sh @@ -30,7 +30,7 @@ download_wiimm () { echo "Choose a Mario Kart Wiimm Distribution ALL Build all distributions." - gawk -F \: 'NR>1 {print $1 "\t" $2}' < ${PATCHIMAGE_SCRIPT_DIR}/mkwiimm.db + gawk -F \: 'NR>1 {print $1 "\t" $2}' < ${PATCHIMAGE_DATABASE_DIR}/mkwiimm.db echo " type in ALL or an ID (multiple separated by space)" read ID @@ -119,9 +119,9 @@ PRIV_SAVEGAME=${MKWIIMM_OWN_SAVE}" > ${PWD}/config.def build_mkwiimm () { MY_ID=${1} - DIST=$(gawk -F \: "/^${MY_ID}/"'{print $2}' < ${PATCHIMAGE_SCRIPT_DIR}/mkwiimm.db) - DOWNLOAD=$(gawk -F \: "/^${MY_ID}/"'{print $3}' < ${PATCHIMAGE_SCRIPT_DIR}/mkwiimm.db) - FILENAME=$(gawk -F \: "/^${MY_ID}/"'{split($3, a, "/") ; print a[3]}' < ${PATCHIMAGE_SCRIPT_DIR}/mkwiimm.db) + DIST=$(gawk -F \: "/^${MY_ID}/"'{print $2}' < ${PATCHIMAGE_DATABASE_DIR}/mkwiimm.db) + DOWNLOAD=$(gawk -F \: "/^${MY_ID}/"'{print $3}' < ${PATCHIMAGE_DATABASE_DIR}/mkwiimm.db) + FILENAME=$(gawk -F \: "/^${MY_ID}/"'{split($3, a, "/") ; print a[3]}' < ${PATCHIMAGE_DATABASE_DIR}/mkwiimm.db) if [[ ${FILENAME} != mkw* ]]; then echo "wrong ID passed from user-input, exiting." @@ -143,7 +143,7 @@ build_mkwiimm () { ln -s "${IMAGE}" . chmod +x *.sh - if [[ ${MKWIIMM_OVERRIDE_SZS} == "TRUE" ]] && cp -r ${PATCHIMAGE_SCRIPT_DIR}/../override/* ${PWD}/bin/ + if [[ ${MKWIIMM_OVERRIDE_SZS} == "TRUE" ]] && cp -r ${PATCHIMAGE_OVERRIDE_DIR}/* ${PWD}/bin/ if [[ ${MY_ID} -lt 27 ]]; then mkwiimm_olddist diff --git a/script.d/mkwiimm_fonts.sh b/script.d/mkwii/mkwiimm_fonts.sh similarity index 96% rename from script.d/mkwiimm_fonts.sh rename to script.d/mkwii/mkwiimm_fonts.sh index 8b766e7..9843903 100644 --- a/script.d/mkwiimm_fonts.sh +++ b/script.d/mkwii/mkwiimm_fonts.sh @@ -40,7 +40,7 @@ download_wiimm () { orig Original Mario Kart Wii Font" - gawk -F \: '{print $1 "\t\t" $2}' < ${PATCHIMAGE_SCRIPT_DIR}/mkwiimm_fonts.db + gawk -F \: '{print $1 "\t\t" $2}' < ${PATCHIMAGE_DATABASE_DIR}/mkwiimm_fonts.db echo -e "\ntype ???.szs or orig" read FONT diff --git a/script.d/mkwiimm_items.sh b/script.d/mkwii/mkwiimm_items.sh similarity index 97% rename from script.d/mkwiimm_items.sh rename to script.d/mkwii/mkwiimm_items.sh index d013fc8..9445c47 100644 --- a/script.d/mkwiimm_items.sh +++ b/script.d/mkwii/mkwiimm_items.sh @@ -76,7 +76,7 @@ ask_items () { orig Original item" - gawk -F \: "/${slot}/"'{print $1 "\t" $3}' < ${PATCHIMAGE_SCRIPT_DIR}/mkwiimm_items.db + gawk -F \: "/${slot}/"'{print $1 "\t" $3}' < ${PATCHIMAGE_DATABASE_DIR}/mkwiimm_items.db echo -e "\ntype orig or ???.brres" read slotid echo "<<<<<<>>>>>>" diff --git a/script.d/mkwiimm_karts.sh b/script.d/mkwii/mkwiimm_karts.sh similarity index 92% rename from script.d/mkwiimm_karts.sh rename to script.d/mkwii/mkwiimm_karts.sh index cf3db33..096d13f 100644 --- a/script.d/mkwiimm_karts.sh +++ b/script.d/mkwii/mkwiimm_karts.sh @@ -36,12 +36,12 @@ check_input_image_special () { ask_slot () { echo -e "\nFirst choose a vehicle to be replaced\n" - gawk -F \: '{print $1 "\t\t" $2}' < ${PATCHIMAGE_SCRIPT_DIR}/mkwiimm_vehicles.db + gawk -F \: '{print $1 "\t\t" $2}' < ${PATCHIMAGE_DATABASE_DIR}/mkwiimm_vehicles.db echo -e "\ntype in ??_??? as in first column\n" read VEHICLE echo -e "\nNow choose a character to be replaced\n" - gawk -F \: '{print $1 "\t\t" $2}' < ${PATCHIMAGE_SCRIPT_DIR}/mkwiimm_characters.db + gawk -F \: '{print $1 "\t\t" $2}' < ${PATCHIMAGE_DATABASE_DIR}/mkwiimm_characters.db echo -e "\ntype in -?? as in first column\n" read CHARACTER @@ -64,7 +64,7 @@ download_wiimm () { if [[ ${choosenkarts[@]} == "" ]]; then echo -e "Choose a character to add to the game\n" - gawk -F \: '{print $1 "\t\t" $2}' < ${PATCHIMAGE_SCRIPT_DIR}/mkwiimm_karts.db + gawk -F \: '{print $1 "\t\t" $2}' < ${PATCHIMAGE_DATABASE_DIR}/mkwiimm_karts.db echo -e "\ntype ???.szs (multiple possible, space separated)" read KART diff --git a/script.d/wiimmfi.sh b/script.d/mkwii/wiimmfi.sh similarity index 100% rename from script.d/wiimmfi.sh rename to script.d/mkwii/wiimmfi.sh diff --git a/script.d/anothersmb.sh b/script.d/nsmbw/anothersmb.sh similarity index 100% rename from script.d/anothersmb.sh rename to script.d/nsmbw/anothersmb.sh diff --git a/script.d/awesomersuperluigi.sh b/script.d/nsmbw/awesomersuperluigi.sh similarity index 100% rename from script.d/awesomersuperluigi.sh rename to script.d/nsmbw/awesomersuperluigi.sh diff --git a/script.d/cannon.sh b/script.d/nsmbw/cannon.sh similarity index 100% rename from script.d/cannon.sh rename to script.d/nsmbw/cannon.sh diff --git a/script.d/darkumbrasmb.sh b/script.d/nsmbw/darkumbrasmb.sh similarity index 100% rename from script.d/darkumbrasmb.sh rename to script.d/nsmbw/darkumbrasmb.sh diff --git a/script.d/devilmariowinterspecial.sh b/script.d/nsmbw/devilmariowinterspecial.sh similarity index 100% rename from script.d/devilmariowinterspecial.sh rename to script.d/nsmbw/devilmariowinterspecial.sh diff --git a/script.d/epicbowserworld.sh b/script.d/nsmbw/epicbowserworld.sh similarity index 100% rename from script.d/epicbowserworld.sh rename to script.d/nsmbw/epicbowserworld.sh diff --git a/script.d/ghostlysuperghostbooswii.sh b/script.d/nsmbw/ghostlysuperghostbooswii.sh similarity index 100% rename from script.d/ghostlysuperghostbooswii.sh rename to script.d/nsmbw/ghostlysuperghostbooswii.sh diff --git a/script.d/koopacountry.sh b/script.d/nsmbw/koopacountry.sh similarity index 100% rename from script.d/koopacountry.sh rename to script.d/nsmbw/koopacountry.sh diff --git a/script.d/luigissuperyoshibros.sh b/script.d/nsmbw/luigissuperyoshibros.sh similarity index 100% rename from script.d/luigissuperyoshibros.sh rename to script.d/nsmbw/luigissuperyoshibros.sh diff --git a/script.d/midissupermariowii.sh b/script.d/nsmbw/midissupermariowii.sh similarity index 100% rename from script.d/midissupermariowii.sh rename to script.d/nsmbw/midissupermariowii.sh diff --git a/script.d/newerapocalypse.sh b/script.d/nsmbw/newerapocalypse.sh similarity index 100% rename from script.d/newerapocalypse.sh rename to script.d/nsmbw/newerapocalypse.sh diff --git a/script.d/newerfallingleaf.sh b/script.d/nsmbw/newerfallingleaf.sh similarity index 100% rename from script.d/newerfallingleaf.sh rename to script.d/nsmbw/newerfallingleaf.sh diff --git a/script.d/newerholiday.sh b/script.d/nsmbw/newerholiday.sh similarity index 100% rename from script.d/newerholiday.sh rename to script.d/nsmbw/newerholiday.sh diff --git a/script.d/newersmb.sh b/script.d/nsmbw/newersmb.sh similarity index 100% rename from script.d/newersmb.sh rename to script.d/nsmbw/newersmb.sh diff --git a/script.d/newersummersun.sh b/script.d/nsmbw/newersummersun.sh similarity index 100% rename from script.d/newersummersun.sh rename to script.d/nsmbw/newersummersun.sh diff --git a/script.d/newsmbwotherworld.sh b/script.d/nsmbw/newsmbwotherworld.sh similarity index 100% rename from script.d/newsmbwotherworld.sh rename to script.d/nsmbw/newsmbwotherworld.sh diff --git a/script.d/nsmbw3.sh b/script.d/nsmbw/nsmbw3.sh similarity index 100% rename from script.d/nsmbw3.sh rename to script.d/nsmbw/nsmbw3.sh diff --git a/script.d/nsmbw4.sh b/script.d/nsmbw/nsmbw4.sh similarity index 100% rename from script.d/nsmbw4.sh rename to script.d/nsmbw/nsmbw4.sh diff --git a/script.d/nsmbw_characters.sh b/script.d/nsmbw/nsmbw_characters.sh similarity index 92% rename from script.d/nsmbw_characters.sh rename to script.d/nsmbw/nsmbw_characters.sh index d1fdff6..8dd29bd 100644 --- a/script.d/nsmbw_characters.sh +++ b/script.d/nsmbw/nsmbw_characters.sh @@ -50,7 +50,7 @@ pi_action () { if [[ ${choosenplayers[@]} == "" ]]; then echo -e "Choose a Player to add to the game\n" - gawk -F \: '{print $1 "\t\t" $2 "\t\t" $3}' < ${PATCHIMAGE_SCRIPT_DIR}/nsmbw_characters.db + gawk -F \: '{print $1 "\t\t" $2 "\t\t" $3}' < ${PATCHIMAGE_DATABASE_DIR}/nsmbw_characters.db echo -e "\ntype ???.arc (only one per slot (second column) possible, space separated)" read PLAYERS @@ -63,7 +63,7 @@ pi_action () { && rm ${PATCHIMAGE_RIIVOLUTION_DIR}/${player} \ && exit 57) fi - slot=$(gawk -F \: "/^${player}/"'{print $2}' ${PATCHIMAGE_SCRIPT_DIR}/nsmbw_characters.db) + slot=$(gawk -F \: "/^${player}/"'{print $2}' ${PATCHIMAGE_DATABASE_DIR}/nsmbw_characters.db) choosenplayers=( ${choosenplayers[@]} ${player}:${slot} ) done diff --git a/script.d/remixedsupermariobroswii.sh b/script.d/nsmbw/remixedsupermariobroswii.sh similarity index 100% rename from script.d/remixedsupermariobroswii.sh rename to script.d/nsmbw/remixedsupermariobroswii.sh diff --git a/script.d/retroremix.sh b/script.d/nsmbw/retroremix.sh similarity index 100% rename from script.d/retroremix.sh rename to script.d/nsmbw/retroremix.sh diff --git a/script.d/revisedsupermariobroswii.sh b/script.d/nsmbw/revisedsupermariobroswii.sh similarity index 100% rename from script.d/revisedsupermariobroswii.sh rename to script.d/nsmbw/revisedsupermariobroswii.sh diff --git a/script.d/rvlution.sh b/script.d/nsmbw/rvlution.sh similarity index 100% rename from script.d/rvlution.sh rename to script.d/nsmbw/rvlution.sh diff --git a/script.d/skyland.sh b/script.d/nsmbw/skyland.sh similarity index 100% rename from script.d/skyland.sh rename to script.d/nsmbw/skyland.sh diff --git a/script.d/summervacation.sh b/script.d/nsmbw/summervacation.sh similarity index 100% rename from script.d/summervacation.sh rename to script.d/nsmbw/summervacation.sh diff --git a/script.d/thelegendofyoshi.sh b/script.d/nsmbw/thelegendofyoshi.sh similarity index 100% rename from script.d/thelegendofyoshi.sh rename to script.d/nsmbw/thelegendofyoshi.sh diff --git a/script.d/pokemoneternalx.sh b/script.d/pokemon/pokemoneternalx.sh similarity index 100% rename from script.d/pokemoneternalx.sh rename to script.d/pokemon/pokemoneternalx.sh diff --git a/script.d/pokemonneox.sh b/script.d/pokemon/pokemonneox.sh similarity index 100% rename from script.d/pokemonneox.sh rename to script.d/pokemon/pokemonneox.sh diff --git a/script.d/pokemonneoy.sh b/script.d/pokemon/pokemonneoy.sh similarity index 100% rename from script.d/pokemonneoy.sh rename to script.d/pokemon/pokemonneoy.sh diff --git a/script.d/pokemonrisingruby.sh b/script.d/pokemon/pokemonrisingruby.sh similarity index 100% rename from script.d/pokemonrisingruby.sh rename to script.d/pokemon/pokemonrisingruby.sh diff --git a/script.d/pokemonrutileruby.sh b/script.d/pokemon/pokemonrutileruby.sh similarity index 100% rename from script.d/pokemonrutileruby.sh rename to script.d/pokemon/pokemonrutileruby.sh diff --git a/script.d/pokemonsinkingsapphire.sh b/script.d/pokemon/pokemonsinkingsapphire.sh similarity index 100% rename from script.d/pokemonsinkingsapphire.sh rename to script.d/pokemon/pokemonsinkingsapphire.sh diff --git a/script.d/pokemonstarsapphire.sh b/script.d/pokemon/pokemonstarsapphire.sh similarity index 100% rename from script.d/pokemonstarsapphire.sh rename to script.d/pokemon/pokemonstarsapphire.sh diff --git a/script.d/pokemonwiltingy.sh b/script.d/pokemon/pokemonwiltingy.sh similarity index 100% rename from script.d/pokemonwiltingy.sh rename to script.d/pokemon/pokemonwiltingy.sh