fix(quickget): update get_manjaro() to support new sway release
This commit is contained in:
parent
4ebb74a993
commit
3832fe731c
28
quickget
28
quickget
|
@ -2171,18 +2171,26 @@ function get_manjaro() {
|
||||||
local ISO=""
|
local ISO=""
|
||||||
local MANIFEST=""
|
local MANIFEST=""
|
||||||
local URL=""
|
local URL=""
|
||||||
local TYPE=""
|
local TYPE="official"
|
||||||
case ${RELEASE} in
|
MANIFEST="$(web_pipe https://gitlab.manjaro.org/web/iso-info/-/raw/master/file-info.json)"
|
||||||
sway) MANIFEST="$(web_pipe https://mirror.manjaro-sway.download/manjaro-sway/release.json)";;
|
case "${RELEASE}" in
|
||||||
gnome|xfce|plasma) TYPE="official";;
|
sway)
|
||||||
*) TYPE="community";;
|
MANIFEST="$(web_pipe https://mirror.manjaro-sway.download/manjaro-sway/release.json)"
|
||||||
|
TYPE="sway"
|
||||||
|
;;
|
||||||
|
cinnamon|i3) TYPE="community";;
|
||||||
esac
|
esac
|
||||||
[[ ${RELEASE} != "sway" ]] && MANIFEST="$(web_pipe https://gitlab.manjaro.org/web/iso-info/-/raw/master/file-info.json)"
|
|
||||||
[[ ${EDITION} == "minimal" && ${TYPE} != "sway" ]] && EDITION=".minimal" || EDITION=""
|
if [ "${EDITION}" == "minimal" ] && [ "${TYPE}" != "sway" ]; then
|
||||||
if [[ ${RELEASE} != "sway" ]]; then
|
EDITION=".minimal"
|
||||||
URL="$(echo ${MANIFEST} | jq -r .${TYPE}.${RELEASE}${EDITION}.image)"
|
|
||||||
else
|
else
|
||||||
URL=$(echo ${MANIFEST} | jq -r '.[] | select(.name|test("^manjaro-sway-.*[.]iso$")) | select(.name|contains("unstable")|not) | .url')
|
EDITION=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "${RELEASE}" == "sway" ]; then
|
||||||
|
URL=$(echo "${MANIFEST}" | jq -r '.[] | select(.name|test("^manjaro-sway-.*[.]iso$")) | .url')
|
||||||
|
else
|
||||||
|
URL="$(echo "${MANIFEST}" | jq -r ."${TYPE}.${RELEASE}${EDITION}".image)"
|
||||||
fi
|
fi
|
||||||
HASH=$(web_pipe "${URL}.sha512" | cut_1)
|
HASH=$(web_pipe "${URL}.sha512" | cut_1)
|
||||||
echo "${URL} ${HASH}"
|
echo "${URL} ${HASH}"
|
||||||
|
|
Loading…
Reference in New Issue