mirror of
				https://github.com/oSoWoSo/DistroHopper.git
				synced 2024-08-14 22:46:53 +00:00 
			
		
		
		
	Added support for Zorin OS (#185)
* Zorin support added to Quickget * Added Zorin Educational releases * Update README * tidy up * Found stupid bug so zorin should be a linux now * get sizing for zorin educational large enough to install (#2) * get sizing for zorin educational large enough to install
This commit is contained in:
		
							parent
							
								
									8f832a843b
								
							
						
					
					
						commit
						0a619985af
					
				
					 2 changed files with 39 additions and 2 deletions
				
			
		|  | @ -33,7 +33,7 @@ comprehensive support for macOS and Windows**. | ||||||
|   * [Ubuntu](https://ubuntu.com/desktop) and all the **[official Ubuntu flavours](https://ubuntu.com/download/flavours)** |   * [Ubuntu](https://ubuntu.com/desktop) and all the **[official Ubuntu flavours](https://ubuntu.com/download/flavours)** | ||||||
|   * [Fedora](https://getfedora.org/) & openSUSE ([Leap](https://get.opensuse.org/leap/), [Tumbleweed](https://get.opensuse.org/tumbleweed/), [MicroOS](https://microos.opensuse.org/)) |   * [Fedora](https://getfedora.org/) & openSUSE ([Leap](https://get.opensuse.org/leap/), [Tumbleweed](https://get.opensuse.org/tumbleweed/), [MicroOS](https://microos.opensuse.org/)) | ||||||
|   * [Linux Mint](https://linuxmint.com/) (Cinnamon, MATE, and XFCE), [elementary OS](https://elementary.io/), [Pop!_OS](https://pop.system76.com/) |   * [Linux Mint](https://linuxmint.com/) (Cinnamon, MATE, and XFCE), [elementary OS](https://elementary.io/), [Pop!_OS](https://pop.system76.com/) | ||||||
|   * [Arch Linux](https://www.archlinux.org/), [Kali](https://www.kali.org/) & [NixOS](https://nixos.org/) |   * [Arch Linux](https://www.archlinux.org/), [Kali](https://www.kali.org/), [ZorinOS](https://zorin.com/os/) & [NixOS](https://nixos.org/) | ||||||
|   * [FreeBSD](https://www.freebsd.org/) & [OpenBSD](https://www.openbsd.org/) |   * [FreeBSD](https://www.freebsd.org/) & [OpenBSD](https://www.openbsd.org/) | ||||||
|   * Full SPICE support including host/guest clipboard sharing |   * Full SPICE support including host/guest clipboard sharing | ||||||
|   * VirtIO-webdavd file sharing for Linux and Windows guests |   * VirtIO-webdavd file sharing for Linux and Windows guests | ||||||
|  | @ -180,6 +180,7 @@ preferred flavour. | ||||||
|   * `nixos-gnome` |   * `nixos-gnome` | ||||||
|   * `nixos-plasma5` |   * `nixos-plasma5` | ||||||
|   * `nixos-minimal` |   * `nixos-minimal` | ||||||
|  |   * `zorin` | ||||||
| 
 | 
 | ||||||
| Or you can download a Linux image and manually create a VM configuration. | Or you can download a Linux image and manually create a VM configuration. | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
							
								
								
									
										38
									
								
								quickget
									
										
									
									
									
								
							
							
						
						
									
										38
									
								
								quickget
									
										
									
									
									
								
							|  | @ -53,6 +53,7 @@ function pretty_name() { | ||||||
|     ubuntu-kylin)       PRETTY_NAME="Ubuntu Kylin";; |     ubuntu-kylin)       PRETTY_NAME="Ubuntu Kylin";; | ||||||
|     ubuntu-mate)        PRETTY_NAME="Ubuntu MATE";; |     ubuntu-mate)        PRETTY_NAME="Ubuntu MATE";; | ||||||
|     ubuntu-studio)      PRETTY_NAME="Ubuntu Studio";; |     ubuntu-studio)      PRETTY_NAME="Ubuntu Studio";; | ||||||
|  |     zorin)              PRETTY_NAME="Zorin OS";; | ||||||
|     *)                  PRETTY_NAME="${SIMPLE_NAME^}";; |     *)                  PRETTY_NAME="${SIMPLE_NAME^}";; | ||||||
|   esac |   esac | ||||||
|   echo "${PRETTY_NAME}" |   echo "${PRETTY_NAME}" | ||||||
|  | @ -151,7 +152,8 @@ function os_support() { | ||||||
|     ubuntu-mate \ |     ubuntu-mate \ | ||||||
|     ubuntu-studio \ |     ubuntu-studio \ | ||||||
|     windows \ |     windows \ | ||||||
|     xubuntu |     xubuntu \ | ||||||
|  |     zorin | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| function releases_android() { | function releases_android() { | ||||||
|  | @ -288,6 +290,15 @@ function releases_windows() { | ||||||
|     11 |     11 | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | function releases_zorin() { | ||||||
|  |     echo 16core64 \ | ||||||
|  |     15lite64 \ | ||||||
|  |     15lite32 \ | ||||||
|  |     15education64 \ | ||||||
|  |     15edulite64 \ | ||||||
|  |     15edulite32 | ||||||
|  | } | ||||||
|  | 
 | ||||||
| function unattended_windows() { | function unattended_windows() { | ||||||
|     cat << 'EOF' > "${1}" |     cat << 'EOF' > "${1}" | ||||||
| <?xml version="1.0" encoding="utf-8"?> | <?xml version="1.0" encoding="utf-8"?> | ||||||
|  | @ -615,6 +626,9 @@ function make_vm_config() { | ||||||
|     elif [ "${OS}" == "windows" ]; then |     elif [ "${OS}" == "windows" ]; then | ||||||
|         GUEST="windows" |         GUEST="windows" | ||||||
|         IMAGE_TYPE="iso" |         IMAGE_TYPE="iso" | ||||||
|  |     elif [ "${OS}" == "zorin" ]; then | ||||||
|  |         GUEST="linux" | ||||||
|  |         IMAGE_TYPE="iso" | ||||||
|     fi |     fi | ||||||
| 
 | 
 | ||||||
|     if [ ! -e "${OS}-${RELEASE}.conf" ]; then |     if [ ! -e "${OS}-${RELEASE}.conf" ]; then | ||||||
|  | @ -635,6 +649,12 @@ EOF | ||||||
|         if [ "${OS}" == "macos" ]; then |         if [ "${OS}" == "macos" ]; then | ||||||
|             echo "macos_release=\"${RELEASE}\"" >> "${OS}-${RELEASE}.conf" |             echo "macos_release=\"${RELEASE}\"" >> "${OS}-${RELEASE}.conf" | ||||||
|         fi |         fi | ||||||
|  |         if [ "${OS}" == "zorin"  ]; then  | ||||||
|  |             case  ${RELEASE} in | ||||||
|  |               15education64|15edulite64|15edulite32) | ||||||
|  |                 echo "disk_size=\"32G\"" >> "${OS}-${RELEASE}.conf";; | ||||||
|  |             esac   | ||||||
|  |         fi | ||||||
| 
 | 
 | ||||||
|         # Enable TPM for Windows 11 |         # Enable TPM for Windows 11 | ||||||
|         if [ "${OS}" == "windows" ] && [ "${RELEASE}" -ge 11 ]; then |         if [ "${OS}" == "windows" ] && [ "${RELEASE}" -ge 11 ]; then | ||||||
|  | @ -816,6 +836,18 @@ function get_openbsd() { | ||||||
|     make_vm_config "${ISO}" |     make_vm_config "${ISO}" | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | function get_zorin() { | ||||||
|  |     local ISO="" | ||||||
|  |     local URL="" | ||||||
|  | 
 | ||||||
|  |     validate_release "releases_zorin" | ||||||
|  |     # their redirector returns an href so we need to get that and parse out the iso    | ||||||
|  |     URL=$(curl -s https://zrn.co/${RELEASE} |cut -d\" -f2)  | ||||||
|  |     ISO=$(echo ${URL}| awk -F\/ ' {print $NF}')  | ||||||
|  |     web_get "${URL}" "${VM_PATH}" | ||||||
|  |     make_vm_config "${ISO}" | ||||||
|  | } | ||||||
|  | 
 | ||||||
| function get_rocky() { | function get_rocky() { | ||||||
|     local HASH="" |     local HASH="" | ||||||
|     local ISO="" |     local ISO="" | ||||||
|  | @ -1165,6 +1197,8 @@ if [ -n "${2}" ]; then | ||||||
|             LANG_NAME="English International" |             LANG_NAME="English International" | ||||||
|         fi |         fi | ||||||
|         get_windows "${LANG_NAME}" |         get_windows "${LANG_NAME}" | ||||||
|  |     elif [ "${OS}" == "zorin" ]; then | ||||||
|  |         get_zorin | ||||||
|     else |     else | ||||||
|         echo "ERROR! ${OS} is unknown:" |         echo "ERROR! ${OS} is unknown:" | ||||||
|         os_support |         os_support | ||||||
|  | @ -1198,6 +1232,8 @@ else | ||||||
|         releases_ubuntu |         releases_ubuntu | ||||||
|     elif [ "${OS}" == "windows" ]; then |     elif [ "${OS}" == "windows" ]; then | ||||||
|         releases_windows |         releases_windows | ||||||
|  |     elif [ "${OS}" == "zorin" ]; then | ||||||
|  |         releases_zorin         | ||||||
|     else |     else | ||||||
|         echo "${OS} is unknown" |         echo "${OS} is unknown" | ||||||
|         os_support |         os_support | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue