From 3c5334e52e9b3ecdd8438b293d3d892d798b4651 Mon Sep 17 00:00:00 2001 From: Locutus73 Date: Sun, 26 May 2019 20:46:27 +0200 Subject: [PATCH] Version 1.0.3 Improved DEB packages downloading routine. --- ini_settings.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ini_settings.sh b/ini_settings.sh index 8b83dd7..31f03f2 100644 --- a/ini_settings.sh +++ b/ini_settings.sh @@ -18,7 +18,8 @@ # You can download the latest version of this script from: # https://github.com/MiSTer-devel/Scripts_MiSTer -# Version 1.0.2 - 2019-05-26 - Added error checking during DEB packages downloading. +# Version 1.0.3 - 2019-05-26 - Improved DEB packages downloading routine. +# Version 1.0.2 - 2019-05-26 - Added error checks during DEB packages downloading. # Version 1.0.1 - 2019-05-26 - Added Windows(CrLf)<->Unix(Lf) character handling. # Version 1.0 - 2019-05-26 - First commit @@ -258,11 +259,11 @@ function installDEBS () { IFS="${OLD_IFS}" if [ ! -f "${DEST_DIR}/$(echo $ARCHIVE_FILES | sed 's/*//g')" ] then - DEB_NAMES=$(${CURL_SILENT} "${DEBS_URL}" | grep -oE "\"${DEB_PREFIX}[a-zA-Z0-9./_+-]*_(armhf|all)\.deb\"" | sed 's/\"//g') + DEB_NAMES=$(${CURL_SILENT} "${DEBS_URL}" | grep -oE "\"${DEB_PREFIX}[a-zA-Z0-9%./_+-]*_(armhf|all)\.deb\"" | sed 's/\"//g') MAX_VERSION="" MAX_DEB_NAME="" for DEB_NAME in $DEB_NAMES; do - CURRENT_VERSION=$(echo "${DEB_NAME}" | grep -o '_[a-zA-Z0-9.+-]*_' | sed 's/_//g') + CURRENT_VERSION=$(echo "${DEB_NAME}" | grep -o '_[a-zA-Z0-9%.+-]*_' | sed 's/_//g') if [[ "${CURRENT_VERSION}" > "${MAX_VERSION}" ]] then MAX_VERSION="${CURRENT_VERSION}"