diff --git a/functions/core_dl.sh b/functions/core_dl.sh index 1d90acab7..b509d4f82 100644 --- a/functions/core_dl.sh +++ b/functions/core_dl.sh @@ -41,7 +41,7 @@ dl_url=$3 dl_md5=$4 if [ ! -f "${dl_filepath}/${dl_filename}" ]||[ -n "${retry_dl}" ]; then - echo -e "downloading ${dl_filename}..." + echo -ne "downloading ${dl_filename}..." dl=$(curl --progress-bar --fail -o "${dl_filepath}/${dl_filename}" "${dl_url}") exitcode=$? echo -ne "downloading ${dl_filename}...\c" @@ -53,7 +53,7 @@ if [ ! -f "${dl_filepath}/${dl_filename}" ]||[ -n "${retry_dl}" ]; then fn_printokeol fi else - echo -ne "${dl_filename} already exists...\c" + echo -e "${dl_filename} already exists...\c" fn_dl_md5 while true; do read -e -i "n" -p "Download again? [y/N]" yn diff --git a/functions/install_dl_ut99.sh b/functions/install_dl_ut99.sh index 820970d03..fa7d64d6d 100644 --- a/functions/install_dl_ut99.sh +++ b/functions/install_dl_ut99.sh @@ -8,28 +8,4 @@ echo "" echo "Downloading Server Files" echo "=================================" sleep 1 -echo "" -fn_dl "ut-server-436.tar.gz" "${filesdir}" "http://gameservermanagers.com/files/ut99/ut-server-436.tar.gz" "10cd7353aa9d758a075c600a6dd193fd" - -#if [ ! -f UTPGPatch451.tar.bz2 ]; then -# wget http://gameservermanagers.com/files/ut99/UTPGPatch451.tar.bz2 -#else -# echo "UTPGPatch451.tar.bz2 already downloaded!" -#fi -#echo "Running MD5 checksum to verify the file" -#sleep 1 -#echo "MD5 checksum: 77a735a78b1eb819042338859900b83b" -#md5check=$(md5sum UTPGPatch451.tar.bz2|awk '{print $1;}') -#echo "File returned: ${md5check}" -#if [ "${md5check}" != "77a735a78b1eb819042338859900b83b" ]; then -# echo "MD5 checksum: FAILED!" -# read -p "Retry download? [y/N]" yn -# case $yn in -# [Yy]* ) rm -fv UTPGPatch451.tar.bz2; fn_filesdl;; -# [Nn]* ) echo Exiting; exit;; -# * ) echo "Please answer yes or no.";; -# esac -#else -# echo "MD5 checksum: PASSED" -#fi -#echo "" \ No newline at end of file +fn_dl "ut-server-451-complete.tar.bz2" "${filesdir}" "http://gameservermanagers.com/files/ut99/ut-server-451-complete.tar.bz2" "42a8c9806e4fce10a56830caca83ce63"