mirror of
				https://github.com/oSoWoSo/DistroHopper.git
				synced 2024-08-14 22:46:53 +00:00 
			
		
		
		
	
							parent
							
								
									4f400b0523
								
							
						
					
					
						commit
						27534985e7
					
				
					 1 changed files with 29 additions and 5 deletions
				
			
		
							
								
								
									
										34
									
								
								quickget
									
										
									
									
									
								
							
							
						
						
									
										34
									
								
								quickget
									
										
									
									
									
								
							|  | @ -547,6 +547,10 @@ function releases_manjaro() { | ||||||
|     mate |     mate | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | function editions_manjaro(){ | ||||||
|  |     echo full minimal | ||||||
|  | } | ||||||
|  | 
 | ||||||
| function releases_mxlinux(){ | function releases_mxlinux(){ | ||||||
|     echo 21.3 |     echo 21.3 | ||||||
| } | } | ||||||
|  | @ -1709,18 +1713,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}" | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | @ -2563,6 +2579,14 @@ if [ -n "${2}" ]; then | ||||||
|             fi |             fi | ||||||
|         fi |         fi | ||||||
| 
 | 
 | ||||||
|  |         # Handle missing Manjaro 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}" | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue