oSoWoSo/DistroHopper
1
0
Fork 0
mirror of https://github.com/oSoWoSo/DistroHopper.git synced 2024-08-14 22:46:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix get_windows()

Browse source 
Use the passed LANG as LANG_EDITION. Simpler INDEX tweaking, make shellcheck happy.
This commit is contained in:
Martin Wimpress 2022-02-22 02:03:42 +00:00
parent 4ec224cde8
commit 9443931dbb
No known key found for this signature in database
GPG key ID: 61DF940515E06DA3
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
quickget
View file

@ -1850,6 +1850,7 @@ function get_windows() {
local ARCH="x64" local ARCH="x64"
local INDEX=0 local INDEX=0
local LANG_CODE="en" local LANG_CODE="en"
local LANG_EDITION=""
local LATEST_WINDOWS_VERSION="" local LATEST_WINDOWS_VERSION=""
local WINDOWS_NAME="" local WINDOWS_NAME=""
local VERSION_ID="" local VERSION_ID=""
@ -1861,19 +1862,18 @@ function get_windows() {
local DOWNLOAD_ID="" local DOWNLOAD_ID=""
local DOWNLOAD_URL="" local DOWNLOAD_URL=""
# Ignore the most recent Windows 10 release for now. LANG_EDITION="${1}"
if [ "${RELEASE}" -eq 10 ]; then
INDEX=0
fi
if [ "${RELEASE}" -eq 11 ]; then # Ignore the most recent Windows 10 release for now.
INDEX=0 case ${RELEASE} in
fi 10) INDEX=0;;
11) INDEX=0;;
esac
echo "Getting Windows ${RELEASE} URL..." echo "Getting Windows ${RELEASE} URL..."
WINDOWS_VERSIONS=$(wget -q -O- "https://tb.rg-adguard.net/php/get_version.php?type_id=1" | jq '.versions | sort_by(-(.version_id | tonumber))') WINDOWS_VERSIONS=$(wget -q -O- "https://tb.rg-adguard.net/php/get_version.php?type_id=1" | jq '.versions | sort_by(-(.version_id | tonumber))')
dbg_windows "${WINDOWS_VERSIONS}" dbg_windows "${WINDOWS_VERSIONS}"
LATEST_WINDOWS_VERSION=$(echo "${WINDOWS_VERSIONS}" | jq -c 'map(select(.name | contains("Windows '${RELEASE}'")))['${INDEX}']') LATEST_WINDOWS_VERSION=$(echo "${WINDOWS_VERSIONS}" | jq -c 'map(select(.name | contains("Windows '"${RELEASE}"'")))['${INDEX}']')
dbg_windows "${LATEST_WINDOWS_VERSION}" dbg_windows "${LATEST_WINDOWS_VERSION}"
WINDOWS_NAME=$(echo "${LATEST_WINDOWS_VERSION}" | jq -r .name) WINDOWS_NAME=$(echo "${LATEST_WINDOWS_VERSION}" | jq -r .name)
@ -1883,11 +1883,11 @@ function get_windows() {
case ${RELEASE} in case ${RELEASE} in
8) EDITION_ID=$(wget -q -O- "https://tb.rg-adguard.net/php/get_edition.php?version_id=${VERSION_ID}&lang=name_${LANG_CODE}" | jq -r '.editions[] | select(.name_'${LANG_CODE}'=="Windows 8.1 Pro + Core").edition_id');; 8) EDITION_ID=$(wget -q -O- "https://tb.rg-adguard.net/php/get_edition.php?version_id=${VERSION_ID}&lang=name_${LANG_CODE}" | jq -r '.editions[] | select(.name_'${LANG_CODE}'=="Windows 8.1 Pro + Core").edition_id');;
10|11) EDITION_ID=$(wget -q -O- "https://tb.rg-adguard.net/php/get_edition.php?version_id=${VERSION_ID}&lang=name_${LANG_CODE}" | jq -r '.editions[] | select(.name_'${LANG_CODE}'=="Windows '${RELEASE}'").edition_id');; 10|11) EDITION_ID=$(wget -q -O- "https://tb.rg-adguard.net/php/get_edition.php?version_id=${VERSION_ID}&lang=name_${LANG_CODE}" | jq -r '.editions[] | select(.name_'${LANG_CODE}'=="Windows '"${RELEASE}"'").edition_id');;
esac esac
dbg_windows "${EDITION_ID}" dbg_windows "${EDITION_ID}"
LANGUAGE_ID=$(wget -q -O- "https://tb.rg-adguard.net/php/get_language.php?edition_id=${EDITION_ID}&lang=name_${LANG_CODE}" | jq -r '.languages[] | select(.name_'${LANG_CODE}'=="'"${LANG_NAME}"'").language_id') LANGUAGE_ID=$(wget -q -O- "https://tb.rg-adguard.net/php/get_language.php?edition_id=${EDITION_ID}&lang=name_${LANG_CODE}" | jq -r '.languages[] | select(.name_'${LANG_CODE}'=="'"${LANG_EDITION}"'").language_id')
dbg_windows "${LANGUAGE_ID}" dbg_windows "${LANGUAGE_ID}"
ARCH_INFO=$(wget -q -O- "https://tb.rg-adguard.net/php/get_arch.php?language_id=${LANGUAGE_ID}") ARCH_INFO=$(wget -q -O- "https://tb.rg-adguard.net/php/get_arch.php?language_id=${LANGUAGE_ID}")
dbg_windows "${ARCH_INFO}" dbg_windows "${ARCH_INFO}"
@ -2005,7 +2005,7 @@ if [ -n "${2}" ]; then
elif [ "${OS}" == "windows" ]; then elif [ "${OS}" == "windows" ]; then
LANG="English International" LANG="English International"
if [ -n "${3}" ]; then if [ -n "${3}" ]; then
EDITION="${3}" LANG="${3}"
if [[ ! ${LANGS[*]} =~ "${LANG}" ]]; then if [[ ! ${LANGS[*]} =~ "${LANG}" ]]; then
echo -e "ERROR! ${LANG} is not a supported Windows language:\n" echo -e "ERROR! ${LANG} is not a supported Windows language:\n"
for LANG in "${LANGS[@]}"; do for LANG in "${LANGS[@]}"; do