use unrar x, in favour of e, check if a download link exists, before trying to do

This commit is contained in:
Christopher Roy Bratusek 2013-07-03 16:44:13 +02:00
parent ac083990be
commit 1780398e7c

View File

@ -47,8 +47,9 @@ C AnotherSMB
D Newer: Holiday Special D Newer: Holiday Special
E Cannon Super Mario Bros. E Cannon Super Mario Bros.
F Epic Super Bowser World F Epic Super Bowser World
G Koopa Country
G The Legend of Zelda: Parallel Worlds 1 The Legend of Zelda: Parallel Worlds
" "
read GAME read GAME
@ -112,12 +113,15 @@ check_input_image () {
check_riivolution_patch () { check_riivolution_patch () {
if [[ ${DOWNLOAD} ]]; then if [[ ${DOWNLOAD} ]]; then
if [[ ${DOWNLOAD_LINK} ]]; then
if [[ ! -f ${RIIVOLUTION_ZIP} ]]; then if [[ ! -f ${RIIVOLUTION_ZIP} ]]; then
wget ${DOWNLOAD_LINK} -O ${RIIVOLUTION_ZIP} wget ${DOWNLOAD_LINK} -O ${RIIVOLUTION_ZIP}
fi
if [[ ! -d "${RIIVOLUTION_DIR}" ]]; then
unzip ${RIIVOLUTION_ZIP} >/dev/null unzip ${RIIVOLUTION_ZIP} >/dev/null
fi fi
else
echo "no download link for ${GAMENAME} available."
exit 1
fi
elif [[ -f ${RIIVOLUTION_ZIP} && ! -d "${RIIVOLUTION_DIR}" ]]; then elif [[ -f ${RIIVOLUTION_ZIP} && ! -d "${RIIVOLUTION_DIR}" ]]; then
unzip ${RIIVOLUTION_ZIP} >/dev/null unzip ${RIIVOLUTION_ZIP} >/dev/null
elif [[ ! -d "${RIIVOLUTION_DIR}" ]]; then elif [[ ! -d "${RIIVOLUTION_DIR}" ]]; then
@ -181,7 +185,7 @@ while [[ $xcount -lt $pcount ]]; do
if [[ "${PATCH}" == *.zip ]]; then if [[ "${PATCH}" == *.zip ]]; then
unzip "${PATCH}" >/dev/null unzip "${PATCH}" >/dev/null
elif [[ "${PATCH}" == *.rar ]]; then elif [[ "${PATCH}" == *.rar ]]; then
unrar e "${PATCH}" >/dev/null unrar x "${PATCH}" >/dev/null
fi fi
else else
echo -e "PATCH patch ${PATCH} not found." echo -e "PATCH patch ${PATCH} not found."