mirror of
				https://github.com/oSoWoSo/DistroHopper.git
				synced 2024-08-14 22:46:53 +00:00 
			
		
		
		
	Merge remote-tracking branch 'kolibri/master' into merging-updated-distros
This commit is contained in:
		
						commit
						1d0312f430
					
				
					 2 changed files with 61 additions and 2 deletions
				
			
		
							
								
								
									
										34
									
								
								quickget
									
										
									
									
									
								
							
							
						
						
									
										34
									
								
								quickget
									
										
									
									
									
								
							|  | @ -43,6 +43,7 @@ function pretty_name() { | |||
|     freebsd)            PRETTY_NAME="FreeBSD";; | ||||
|     garuda)             PRETTY_NAME="Garuda Linux";; | ||||
|     kdeneon)            PRETTY_NAME="KDE Neon";; | ||||
|     kolibrios)          PRETTY_NAME="KolibriOS";; | ||||
|     linuxmint-cinnamon) PRETTY_NAME="Linux Mint Cinnamon";; | ||||
|     linuxmint-mate)     PRETTY_NAME="Linux Mint MATE";; | ||||
|     linuxmint-xfce)     PRETTY_NAME="Linux Mint XFCE";; | ||||
|  | @ -172,6 +173,7 @@ function os_support() { | |||
|     garuda \ | ||||
|     kali \ | ||||
|     kdeneon \ | ||||
|     kolibrios \ | ||||
|     kubuntu \ | ||||
|     linuxmint-cinnamon \ | ||||
|     linuxmint-mate \ | ||||
|  | @ -280,6 +282,10 @@ function releases_kdeneon() { | |||
|     developer | ||||
| } | ||||
| 
 | ||||
| function releases_kolibrios() { | ||||
|     echo latest-iso | ||||
| } | ||||
| 
 | ||||
| function releases_linuxmint(){ | ||||
|     echo 20.2 | ||||
| } | ||||
|  | @ -550,6 +556,9 @@ function make_vm_config() { | |||
|     elif [ "${OS}" == "kdeneon" ]; then | ||||
|         GUEST="linux" | ||||
|         IMAGE_TYPE="iso" | ||||
|     elif [ "${OS}" == "kolibrios" ]; then | ||||
|         GUEST="kolibrios" | ||||
|         IMAGE_TYPE="iso" | ||||
|     elif [[ "${OS}" == *"linuxmint"* ]]; then | ||||
|         GUEST="linux" | ||||
|         IMAGE_TYPE="iso" | ||||
|  | @ -606,9 +615,15 @@ EOF | |||
|         if [ -n "${ISO_FILE}" ]; then | ||||
|             echo "fixed_iso=\"${VM_PATH}/${ISO_FILE}\"" >> "${OS}-${RELEASE}.conf" | ||||
|         fi | ||||
| 
 | ||||
|         if [ "${OS}" == "alma"  ] && [ ${ISOTYPE} == "dvd" ]; then | ||||
|             echo "disk_size=\"32G\"" >> "${OS}-${RELEASE}.conf" | ||||
|         fi | ||||
| 
 | ||||
|         if [ "${OS}" == "kolibrios" ]; then | ||||
|             echo "boot=\"legacy\"" >> "${OS}-${RELEASE}.conf" | ||||
|         fi | ||||
| 
 | ||||
|         if [ "${OS}" == "openbsd" ]; then | ||||
|             echo "boot=\"legacy\"" >> "${OS}-${RELEASE}.conf" | ||||
|         fi | ||||
|  | @ -853,6 +868,21 @@ function get_kdeneon() { | |||
|     make_vm_config "${ISO}" | ||||
| } | ||||
| 
 | ||||
| function get_kolibrios() { | ||||
|     local HASH="" | ||||
|     local ISO="" | ||||
|     local URL="" | ||||
| 
 | ||||
|     validate_release "releases_kolibrios" | ||||
|     URL="https://builds.kolibrios.org/eng/${RELEASE}.7z" | ||||
|     web_get "${URL}" "${VM_PATH}" | ||||
|     7z e "${VM_PATH}/${RELEASE}.7z" "kolibri.iso" | ||||
|     ISO="kolibrios-${RELEASE}.iso" | ||||
|     mv "kolibri.iso" "${VM_PATH}/${ISO}" | ||||
|     rm "${VM_PATH}/${RELEASE}.7z" | ||||
|     make_vm_config "${ISO}" | ||||
| } | ||||
| 
 | ||||
| function get_linuxmint() { | ||||
|     local FLAVOR="" | ||||
|     local HASH="" | ||||
|  | @ -1684,6 +1714,8 @@ if [ -n "${2}" ]; then | |||
|         get_kali | ||||
|     elif [ "${OS}" == "kdeneon" ]; then | ||||
|         get_kdeneon | ||||
|     elif [ "${OS}" == "kolibrios" ]; then | ||||
|         get_kolibrios | ||||
|     elif [[ "${OS}" == *"linuxmint-"* ]]; then | ||||
|         get_linuxmint | ||||
|     elif [[ "${OS}" == *"nixos-"* ]]; then | ||||
|  | @ -1775,6 +1807,8 @@ else | |||
|         releases_garuda | ||||
|     elif [ "${OS}" == "kali" ]; then | ||||
|         releases_kali | ||||
|     elif [ "${OS}" == "kolibrios" ]; then | ||||
|         releases_kolibrios | ||||
|     elif [[ "${OS}" == *"linuxmint-"* ]]; then | ||||
|         releases_linuxmint | ||||
|     elif [[ "${OS}" == *"nixos-"* ]]; then | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue