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

Updated manjaro fetching as migrated to new system (#742)

Browse source 
* Updated manjaro fetching

- Added sway release
- Added choice to download minimal or full edition

* Future proofing manjaro sway fetching

* Forgot this

kde -> plasma

* Fix a typo

* Update quickget
This commit is contained in:
Jai A P 2023-10-16 16:05:53 +05:30 • committed by GitHub
parent af051339ba
commit 392e74c16b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

40
quickget
View file

@ -472,6 +472,10 @@ function editions_mxlinux(){
echo Xfce KDE Fluxbox echo Xfce KDE Fluxbox
} }
function editions_manjaro(){
echo full minimal
}
function releases_macos() { function releases_macos() {
echo high-sierra mojave catalina big-sur monterey ventura echo high-sierra mojave catalina big-sur monterey ventura
} }
@ -479,11 +483,12 @@ function releases_macos() {
function releases_manjaro() { function releases_manjaro() {
echo xfce \ echo xfce \
gnome \ gnome \
kde \ plasma \
budgie \ budgie \
cinnamon \ cinnamon \
i3 \ i3 \
mate mate \
sway
} }
function releases_netboot() { function releases_netboot() {
@ -1487,18 +1492,30 @@ function get_mageia() {
} }
function get_manjaro() { function get_manjaro() {
local EDITION="${1:-}"
local HASH="" local HASH=""
local ISO="" local ISO=""
local MANIFESTURL="" local MANIFEST=""
local URL="" local URL=""
local TYPE=""
case ${RELEASE} in case ${RELEASE} in
gnome|kde|xfce) MANIFESTURL="https://gitlab.manjaro.org/webpage/manjaro-homepage/-/raw/master/site/content/downloads/official/${RELEASE}.md";; sway) MANIFEST="$( wget -qO- https://mirror.manjaro-sway.download/manjaro-sway/release.json )";;
budgie|cinnamon|deepin|i3|mate) MANIFESTURL="https://gitlab.manjaro.org/webpage/manjaro-homepage/-/raw/master/site/content/downloads/community/${RELEASE}.md";; gnome|xfce|plasma) TYPE="official";;
*) TYPE="community";;
esac esac
URL="$(wget -qO- "${MANIFESTURL}" | grep "Download_x64 =" | cut -d'"' -f2)" [[ ${RELEASE} != "sway" ]] && MANIFEST="$(wget -qO- https://gitlab.manjaro.org/web/iso-info/-/raw/master/file-info.json)"
HASH=$(wget -qO- "${MANIFESTURL}" | grep "Download_x64_Checksum =" | cut -d'"' -f2)
[[ ${EDITION} == "minimal" && ${TYPE} != "sway" ]] && EDITION=".minimal" || EDITION=""
if [[ ${RELEASE} != "sway" ]]; then
URL="$(echo ${MANIFEST} | jq -r .${TYPE}.${RELEASE}${EDITION}.image)"
else
URL=$(echo ${MANIFEST} | jq -r '.[] | select(.name|test("^manjaro-sway-.*[.]iso$")) | select(.name|contains("unstable")|not) | .url')
fi
HASH=$(wget -qO- "${URL}.sha512" | cut -d' ' -f1)
echo "${URL} ${HASH}" echo "${URL} ${HASH}"
} }
@ -2289,6 +2306,15 @@ if [ -n "${2}" ]; then
fi fi
fi fi
# Handle missing Mangaro Sway minimal
if [[ $OS == manjaro ]] ; then
if [[ ${RELEASE} == "sway" && ${EDITION} == "minimal" ]] ; then
echo "ERROR! Unsupported combination"
echo " Manjaro Sway does not have a minimal edition"
exit 1;
fi
fi
VM_PATH="${OS}-${RELEASE}-${EDITION}" VM_PATH="${OS}-${RELEASE}-${EDITION}"
validate_release "releases_${OS}" validate_release "releases_${OS}"