- use 'read -er' instead of 'read -r' so that during user-input readline

features like path-completion can be used.
- in game information fix link to Pokemon Star Sapphire Thread
This commit is contained in:
Christopher Roy Bratusek 2016-08-23 18:19:26 +02:00
parent 78bf8f33fd
commit 5a5de54e4c
17 changed files with 34 additions and 29 deletions

View File

@ -8,6 +8,11 @@ v7.2.2:
- when ${PWD} is writable that will be ${PWD}/patchimage_build, else - when ${PWD} is writable that will be ${PWD}/patchimage_build, else
it will be ${HOME}/patchimage_build it will be ${HOME}/patchimage_build
::misc. changes
- use 'read -er' instead of 'read -r' so that during user-input readline
features like path-completion can be used.
- in game information fix link to Pokemon Star Sapphire Thread
v7.2.1: v7.2.1:
::bug fixes ::bug fixes
- fix ID for Kirby's Adventure Wii and Mario Kart Wii for US versions - fix ID for Kirby's Adventure Wii and Mario Kart Wii for US versions

View File

@ -31,7 +31,7 @@ echo "${SUPPORTED_GAMES_ALL}
Enter ID or Short Name for the Game you want to build (multiple separated by space): Enter ID or Short Name for the Game you want to build (multiple separated by space):
" "
read -r GAME read -er GAME
} }

View File

@ -66,7 +66,7 @@ pi_action () {
7 Restore to original 7 Restore to original
type in a number." type in a number."
read -r ID read -er ID
[[ ${ID} != [0-9] ]] && echo "invalid number provided from user-input." && exit 1 [[ ${ID} != [0-9] ]] && echo "invalid number provided from user-input." && exit 1

View File

@ -28,7 +28,7 @@ ALL Build all distributions."
gawk -F : 'NR>1 {print $1 "\t" $2}' < "${PATCHIMAGE_DATABASE_DIR}"/mkwiimm.db gawk -F : 'NR>1 {print $1 "\t" $2}' < "${PATCHIMAGE_DATABASE_DIR}"/mkwiimm.db
echo " echo "
type in ALL or an ID (multiple separated by space)" type in ALL or an ID (multiple separated by space)"
read -r ID read -er ID
} }

View File

@ -24,7 +24,7 @@ check_input_image_special () {
ask_input_image_mkwiimm ask_input_image_mkwiimm
echo -e "type RMC???.wbfs:\n" echo -e "type RMC???.wbfs:\n"
read -r ID read -er ID
if [[ -f ${PWD}/${ID} ]]; then if [[ -f ${PWD}/${ID} ]]; then
GAMEDIR="${PWD}" GAMEDIR="${PWD}"
@ -45,7 +45,7 @@ orig Original Mario Kart Wii Font"
gawk -F : '{print $1 "\t\t" $2}' < "${PATCHIMAGE_DATABASE_DIR}"/mkwiimm_fonts.db gawk -F : '{print $1 "\t\t" $2}' < "${PATCHIMAGE_DATABASE_DIR}"/mkwiimm_fonts.db
echo -e "\ntype ???.szs or orig" echo -e "\ntype ???.szs or orig"
read -r FONT read -er FONT
if [[ ${FONT} != orig ]]; then if [[ ${FONT} != orig ]]; then
if [[ ! -f ${PATCHIMAGE_DATA_DIR}/mkwiimm_fonts/${FONT} ]]; then if [[ ! -f ${PATCHIMAGE_DATA_DIR}/mkwiimm_fonts/${FONT} ]]; then

View File

@ -24,7 +24,7 @@ check_input_image_special () {
ask_input_image_mkwiimm ask_input_image_mkwiimm
echo -e "type RMC???.wbfs:\n" echo -e "type RMC???.wbfs:\n"
read -r ID read -er ID
if [[ -f ${PWD}/${ID} ]]; then if [[ -f ${PWD}/${ID} ]]; then
GAMEDIR="${PWD}" GAMEDIR="${PWD}"
@ -60,7 +60,7 @@ ask_items () {
if [[ -f ${HOME}/.patchimage.choice ]]; then if [[ -f ${HOME}/.patchimage.choice ]]; then
echo "Your choices from last time can be re-used." echo "Your choices from last time can be re-used."
echo "y (yes) or n (no)" echo "y (yes) or n (no)"
read -r choice read -er choice
[[ ${choice} == y ]] && source "${HOME}"/.patchimage.choice [[ ${choice} == y ]] && source "${HOME}"/.patchimage.choice
fi fi
@ -77,7 +77,7 @@ orig Original item"
gawk -F : "/${slot}/"'{print $1 "\t" $3}' < "${PATCHIMAGE_DATABASE_DIR}"/mkwiimm_items.db gawk -F : "/${slot}/"'{print $1 "\t" $3}' < "${PATCHIMAGE_DATABASE_DIR}"/mkwiimm_items.db
echo -e "\ntype orig or ???.brres" echo -e "\ntype orig or ???.brres"
read -r slotid read -er slotid
echo "<<<<<<>>>>>>" echo "<<<<<<>>>>>>"
choosenitems=( ${choosenitems[@]} ${slot}:${slotid} ) choosenitems=( ${choosenitems[@]} ${slot}:${slotid} )
done done

View File

@ -22,7 +22,7 @@ check_input_image_special () {
ask_input_image_mkwiimm ask_input_image_mkwiimm
echo -e "type ALL or RMC???.wbfs:\n" echo -e "type ALL or RMC???.wbfs:\n"
read -r ID read -er ID
if [[ -f ${PWD}/${ID} ]]; then if [[ -f ${PWD}/${ID} ]]; then
GAMEDIR="${PWD}" GAMEDIR="${PWD}"
@ -39,12 +39,12 @@ ask_slot () {
echo -e "\nFirst choose a vehicle to be replaced\n" echo -e "\nFirst choose a vehicle to be replaced\n"
gawk -F : '{print $1 "\t\t" $2}' < "${PATCHIMAGE_DATABASE_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" echo -e "\ntype in ??_??? as in first column\n"
read -r VEHICLE read -er VEHICLE
echo -e "\nNow choose a character to be replaced\n" echo -e "\nNow choose a character to be replaced\n"
gawk -F : '{print $1 "\t\t" $2}' < "${PATCHIMAGE_DATABASE_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" echo -e "\ntype in -?? as in first column\n"
read -r CHARACTER read -er CHARACTER
choosenkarts=( ${choosenkarts[@]} ${kart}:${VEHICLE}${CHARACTER} ) choosenkarts=( ${choosenkarts[@]} ${kart}:${VEHICLE}${CHARACTER} )
@ -55,7 +55,7 @@ download_wiimm () {
if [[ -f ${HOME}/.patchimage.choice ]]; then if [[ -f ${HOME}/.patchimage.choice ]]; then
echo "Your choices from last time can be re-used." echo "Your choices from last time can be re-used."
echo "y (yes) or n (no)" echo "y (yes) or n (no)"
read -r choice read -er choice
if [[ ${choice} == y ]]; then if [[ ${choice} == y ]]; then
source "${HOME}"/.patchimage.choice source "${HOME}"/.patchimage.choice
@ -66,7 +66,7 @@ download_wiimm () {
echo -e "Choose a character to add to the game\n" echo -e "Choose a character to add to the game\n"
gawk -F : '{print $1 "\t\t" $2}' < "${PATCHIMAGE_DATABASE_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)" echo -e "\ntype ???.szs (multiple possible, space separated)"
read -r KART read -er KART
for kart in "${KART[@]}"; do for kart in "${KART[@]}"; do
if [[ ! -f ${PATCHIMAGE_DATA_DIR}/mkwiimm_karts/${kart} ]]; then if [[ ! -f ${PATCHIMAGE_DATA_DIR}/mkwiimm_karts/${kart} ]]; then

View File

@ -23,7 +23,7 @@ check_input_image_special () {
ask_input_image_mkwiimm ask_input_image_mkwiimm
echo -e "type RMC???.wbfs:\n" echo -e "type RMC???.wbfs:\n"
read -r ID read -er ID
if [[ -f ${PWD}/${ID} ]]; then if [[ -f ${PWD}/${ID} ]]; then
GAMEDIR="${PWD}" GAMEDIR="${PWD}"

View File

@ -23,7 +23,7 @@ check_input_image_special () {
ask_input_image_nsmb ask_input_image_nsmb
echo -e "type ??????.wbfs or ??????.iso:\n" echo -e "type ??????.wbfs or ??????.iso:\n"
read -r ID read -er ID
if [[ -f ${PWD}/${ID} ]]; then if [[ -f ${PWD}/${ID} ]]; then
GAMEDIR="${PWD}" GAMEDIR="${PWD}"
@ -40,7 +40,7 @@ pi_action () {
if [[ -f ${HOME}/.patchimage.choice ]]; then if [[ -f ${HOME}/.patchimage.choice ]]; then
echo "Your choices from last time can be re-used." echo "Your choices from last time can be re-used."
echo "y (yes) or n (no)" echo "y (yes) or n (no)"
read -r choice read -er choice
[[ ${choice} == y ]] && source "${HOME}"/.patchimage.choice [[ ${choice} == y ]] && source "${HOME}"/.patchimage.choice
fi fi
@ -51,7 +51,7 @@ pi_action () {
echo -e "\ntype ???.arc (only one per slot (second column) possible, space separated) echo -e "\ntype ???.arc (only one per slot (second column) possible, space separated)
or type 'restore' to only restore original characters. or type 'restore' to only restore original characters.
" "
read -r PLAYERS read -er PLAYERS
fi fi
rm -rf workdir rm -rf workdir

View File

@ -36,7 +36,7 @@ viola_nerf () {
enter either 'nerf' or press [Enter] to keep: enter either 'nerf' or press [Enter] to keep:
" "
read -r choice read -er choice
case ${choice} in case ${choice} in
[nN]erf ) HANS_EXTRA_PATH="${HANS_PATH}/Viola Nerf Files" ;; [nN]erf ) HANS_EXTRA_PATH="${HANS_PATH}/Viola Nerf Files" ;;
@ -63,7 +63,7 @@ Encounter type changes the wild Pokemon availability:
enter either 'legal', 'rebalanced' or 'insanity': enter either 'legal', 'rebalanced' or 'insanity':
" "
read -r choice read -er choice
case ${choice} in case ${choice} in
[lL]egal ) HANS_PATH="${RIIVOLUTION_DIR}/Legal version" [lL]egal ) HANS_PATH="${RIIVOLUTION_DIR}/Legal version"

View File

@ -41,7 +41,7 @@ check_hans_files () {
enter either 'full' or 'lite': enter either 'full' or 'lite':
" "
read -r choice read -er choice
case ${choice} in case ${choice} in
[fF]ull ) HANS_PATH="${RIIVOLUTION_DIR}"/Full/romfs ;; [fF]ull ) HANS_PATH="${RIIVOLUTION_DIR}"/Full/romfs ;;

View File

@ -41,7 +41,7 @@ check_hans_files () {
enter either 'full' or 'lite': enter either 'full' or 'lite':
" "
read -r choice read -er choice
case ${choice} in case ${choice} in
[fF]ull ) HANS_PATH="${RIIVOLUTION_DIR}"/Full/romfs ;; [fF]ull ) HANS_PATH="${RIIVOLUTION_DIR}"/Full/romfs ;;

View File

@ -52,7 +52,7 @@ Encounter type changes the wild Pokemon availability:
enter either 'legit', 'leveled' or '679': enter either 'legit', 'leveled' or '679':
" "
read -r choice read -er choice
case ${choice} in case ${choice} in
[lL]egit ) HANS_EXTRA_PATH="${RIIVOLUTION_DIR}/Encounter Type/Legit Build" ;; [lL]egit ) HANS_EXTRA_PATH="${RIIVOLUTION_DIR}/Encounter Type/Legit Build" ;;

View File

@ -25,7 +25,7 @@ edited, and the level curve expects use of the Experience Share, which means
that you level up very quickly. You should be hitting Level 100 by the time you that you level up very quickly. You should be hitting Level 100 by the time you
get to the Elite Four. get to the Elite Four.
Source: https://projectpokemon.org/forums/showthread -r.php?46315 Source: https://projectpokemon.org/forums/showthread.php?46315
Base ROM: Pokemon Alpha Sapphire Base ROM: Pokemon Alpha Sapphire
Supported Versions: US, EU, JAP Supported Versions: US, EU, JAP
************************************************" ************************************************"
@ -52,7 +52,7 @@ Encounter type changes the wild Pokemon availability:
enter either 'legit', 'leveled' or '679': enter either 'legit', 'leveled' or '679':
" "
read -r choice read -er choice
case ${choice} in case ${choice} in
[lL]egit ) HANS_EXTRA_PATH="${RIIVOLUTION_DIR}/Encounter Type/Legit Build" ;; [lL]egit ) HANS_EXTRA_PATH="${RIIVOLUTION_DIR}/Encounter Type/Legit Build" ;;

View File

@ -36,7 +36,7 @@ viola_nerf () {
enter either 'nerf' or press [Enter] to keep: enter either 'nerf' or press [Enter] to keep:
" "
read -r choice read -er choice
case choice in case choice in
[nN]erf ) HANS_EXTRA_PATH="${HANS_PATH}/Viola Nerf Files" ;; [nN]erf ) HANS_EXTRA_PATH="${HANS_PATH}/Viola Nerf Files" ;;
@ -63,7 +63,7 @@ Encounter type changes the wild Pokemon availability:
enter either 'legal', 'rebalanced' or 'insanity': enter either 'legal', 'rebalanced' or 'insanity':
" "
read -r choice read -er choice
case ${choice} in case ${choice} in
[lL]egal ) HANS_PATH="${RIIVOLUTION_DIR}/Legal version" [lL]egal ) HANS_PATH="${RIIVOLUTION_DIR}/Legal version"

View File

@ -26,13 +26,13 @@ menu () {
if [[ ! ${XDELTA_PATH} ]]; then if [[ ! ${XDELTA_PATH} ]]; then
echo -e "\nEnter path to the directory containing the delta patches:\n" echo -e "\nEnter path to the directory containing the delta patches:\n"
read -r XDELTA_PATH || exit 75 read -er XDELTA_PATH || exit 75
else status=9 else status=9
fi fi
if [[ ! ${CPK_PATH} ]]; then if [[ ! ${CPK_PATH} ]]; then
echo -e "\nEnter path to the directory containing the game files (cpk):\n" echo -e "\nEnter path to the directory containing the game files (cpk):\n"
read -r CPK_PATH || exit 75 read -er CPK_PATH || exit 75
else status=9 else status=9
fi fi

View File

@ -24,7 +24,7 @@ check_input_image_special () {
ask_input_image_wiimmfi ask_input_image_wiimmfi
echo -e "type ??????.wbfs (or ??????.iso):\n" echo -e "type ??????.wbfs (or ??????.iso):\n"
read -r ID read -er ID
if [[ -f ${PWD}/${ID} ]]; then if [[ -f ${PWD}/${ID} ]]; then
GAMEDIR="${PWD}" GAMEDIR="${PWD}"