mirror of
				https://github.com/oSoWoSo/DistroHopper.git
				synced 2024-08-14 22:46:53 +00:00 
			
		
		
		
	Refactor Solus support to add editions
This commit is contained in:
		
							parent
							
								
									a4080559d6
								
							
						
					
					
						commit
						ba91b7965d
					
				
					 1 changed files with 18 additions and 14 deletions
				
			
		
							
								
								
									
										32
									
								
								quickget
									
										
									
									
									
								
							
							
						
						
									
										32
									
								
								quickget
									
										
									
									
									
								
							|  | @ -423,10 +423,14 @@ function releases_slackware() { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| function releases_solus() { | function releases_solus() { | ||||||
|     echo 4.3-budgie \ |     echo 4.3 | ||||||
|     4.3-gnome \ | } | ||||||
|     4.3-mate \ | 
 | ||||||
|     4.3-plasma | function editions_solus() { | ||||||
|  |     echo budgie \ | ||||||
|  |     gnome \ | ||||||
|  |     mate \ | ||||||
|  |     plasma | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| function releases_tails() { | function releases_tails() { | ||||||
|  | @ -1151,24 +1155,24 @@ function get_slackware() { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| function get_solus() { | function get_solus() { | ||||||
|     local RELNUM="" |     local EDITION="" | ||||||
|     local RELTYPE="" |  | ||||||
|     local HASH="" |     local HASH="" | ||||||
|     local ISO="" |     local ISO="" | ||||||
|     local URL="" |     local URL="" | ||||||
| 
 | 
 | ||||||
|     validate_release "releases_solus" |     validate_release "releases_solus" | ||||||
|     RELNUM=$(echo "${RELEASE}" | cut -d'-' -f1) |       EDITION="${1}" | ||||||
|     RELTYPE=$(echo "${RELEASE}" | cut -d'-' -f2) |     fi | ||||||
|     case ${RELTYPE} in | 
 | ||||||
|  |     case ${EDITION} in | ||||||
|       mate|gnome) |       mate|gnome) | ||||||
|         RELTYPE=${RELTYPE^^};; |         EDITION=${EDITION^^};; | ||||||
|       *) |       *) | ||||||
|         RELTYPE=${RELTYPE^};; |         EDITION=${EDITION^};; | ||||||
|     esac |     esac | ||||||
| 
 | 
 | ||||||
|     ISO="Solus-${RELNUM}-${RELTYPE}.iso" |     URL="https://mirrors.rit.edu/solus/images/${RELEASE}" | ||||||
|     URL="https://mirrors.rit.edu/solus/images/${RELNUM}" |     ISO="Solus-${RELEASE}-${EDITION}.iso" | ||||||
|     HASH=$(wget -q -O- "${URL}.sha256sum" | cut -d' ' -f1) |     HASH=$(wget -q -O- "${URL}.sha256sum" | cut -d' ' -f1) | ||||||
|     web_get "${URL}/${ISO}" "${VM_PATH}" |     web_get "${URL}/${ISO}" "${VM_PATH}" | ||||||
|     check_hash "${ISO}" "${HASH}" |     check_hash "${ISO}" "${HASH}" | ||||||
|  | @ -1882,7 +1886,7 @@ if [ -n "${2}" ]; then | ||||||
| 
 | 
 | ||||||
|     # If the OS has an editions_() function, use it. |     # If the OS has an editions_() function, use it. | ||||||
|     if [[ $(type -t "editions_${OS}") == function ]]; then |     if [[ $(type -t "editions_${OS}") == function ]]; then | ||||||
|         EDITIONS=("$(editions_"${OS}")") |         EDITIONS=($(editions_${OS})) | ||||||
|         EDITION=${EDITIONS[0]} |         EDITION=${EDITIONS[0]} | ||||||
|         if [ -n "${3}" ]; then |         if [ -n "${3}" ]; then | ||||||
|             EDITION="${3}" |             EDITION="${3}" | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue