mirror of
				https://github.com/oSoWoSo/DistroHopper.git
				synced 2024-08-14 22:46:53 +00:00 
			
		
		
		
	waiting for upstream merge
https://github.com/quickemu-project/quickemu/pull/885
This commit is contained in:
		
							parent
							
								
									43d1d2b907
								
							
						
					
					
						commit
						3d7f452481
					
				
					 2 changed files with 94 additions and 42 deletions
				
			
		
							
								
								
									
										10
									
								
								quickemu
									
										
									
									
									
								
							
							
						
						
									
										10
									
								
								quickemu
									
										
									
									
									
								
							|  | @ -1388,6 +1388,13 @@ function sound_card_param_check() { | ||||||
|     fi |     fi | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | function sound_card_param_check() { | ||||||
|  |   if [ "${SOUND_CARD}" != "intel-hda" ] && [ "${SOUND_CARD}" != "ac97" ] && [ "${SOUND_CARD}" != "es1370" ] && [ "${SOUND_CARD}" != "sb16" ] && [ "${SOUND_CARD}" != "none" ]; then | ||||||
|  |     echo "ERROR! Requested sound card '${SOUND_CARD}' is not recognised." | ||||||
|  |     exit 1 | ||||||
|  |   fi | ||||||
|  | } | ||||||
|  | 
 | ||||||
| function viewer_param_check() { | function viewer_param_check() { | ||||||
|     if [ "${VIEWER}" != "none" ] && [ "${VIEWER}" != "spicy" ] && [ "${VIEWER}" != "remote-viewer" ]; then |     if [ "${VIEWER}" != "none" ] && [ "${VIEWER}" != "spicy" ] && [ "${VIEWER}" != "remote-viewer" ]; then | ||||||
|         echo "ERROR! Requested viewer '${VIEWER}' is not recognised." |         echo "ERROR! Requested viewer '${VIEWER}' is not recognised." | ||||||
|  | @ -1736,6 +1743,9 @@ if [ -n "${VM}" ] && [ -e "${VM}" ]; then | ||||||
|     VMPATH=$(realpath "$(dirname "${VM}")") |     VMPATH=$(realpath "$(dirname "${VM}")") | ||||||
|     VM_MONITOR_SOCKETPATH="${VMDIR}/${VMNAME}-monitor.socket" |     VM_MONITOR_SOCKETPATH="${VMDIR}/${VMNAME}-monitor.socket" | ||||||
|     VM_SERIAL_SOCKETPATH="${VMDIR}/${VMNAME}-serial.socket" |     VM_SERIAL_SOCKETPATH="${VMDIR}/${VMNAME}-serial.socket" | ||||||
|  |     if [ ! -f "${disk_img}" ]; then | ||||||
|  |         cd "${VMPATH}" | ||||||
|  |     fi | ||||||
|      |      | ||||||
|     # Backwards compatibility for ${driver_iso} |     # Backwards compatibility for ${driver_iso} | ||||||
|     if [ -n "${driver_iso}" ] && [ -z "${fixed_iso}" ]; then |     if [ -n "${driver_iso}" ] && [ -z "${fixed_iso}" ]; then | ||||||
|  |  | ||||||
							
								
								
									
										74
									
								
								quickget
									
										
									
									
									
								
							
							
						
						
									
										74
									
								
								quickget
									
										
									
									
									
								
							|  | @ -5,7 +5,7 @@ export LC_ALL=C | ||||||
| # | # | ||||||
| #    1. Update os_support() - add new OS, all lowercase | #    1. Update os_support() - add new OS, all lowercase | ||||||
| #    2. Update pretty_name() - add a pretty name for new OS *only if the catch all is not suitable* | #    2. Update pretty_name() - add a pretty name for new OS *only if the catch all is not suitable* | ||||||
| #    3. Update os_homepages() - add a homepage for new OS | #    3. Update os_homepage() - add a homepage for new OS | ||||||
| #    4. Create a releases_newos() generator (required) outputs the current supported release versions | #    4. Create a releases_newos() generator (required) outputs the current supported release versions | ||||||
| #    5. Create a editions_newos() generator (optional) outputs the editions if new OS has multiple flavours/editions | #    5. Create a editions_newos() generator (optional) outputs the editions if new OS has multiple flavours/editions | ||||||
| #    6. Update make_vm_config() - add any *required* new OS tweaks | #    6. Update make_vm_config() - add any *required* new OS tweaks | ||||||
|  | @ -51,6 +51,15 @@ elif [ "${1}" == '--open-distro-homepage' ] || [ "${1}" == '-o' ]; then | ||||||
| elif [ "${1}" == '--show-distro-homepage' ] || [ "${1}" == '-s' ]; then | elif [ "${1}" == '--show-distro-homepage' ] || [ "${1}" == '-s' ]; then | ||||||
|     show_distro_homepage="on" |     show_distro_homepage="on" | ||||||
|     set -- "$2" |     set -- "$2" | ||||||
|  | elif [ "${1}" == '--download-iso'  ] || [ "${1}" == '-d' ]; then | ||||||
|  |     download_iso="on" | ||||||
|  |     if [ -n "$4" ]; then | ||||||
|  |         set -- "$2" "$3" "$4" | ||||||
|  |     elif [ -n "$3" ]; then | ||||||
|  |         set -- "$2" "$3" | ||||||
|  |     else | ||||||
|  |         set -- "$2" | ||||||
|  |     fi | ||||||
| fi | fi | ||||||
| 
 | 
 | ||||||
| function pretty_name() { | function pretty_name() { | ||||||
|  | @ -328,7 +337,7 @@ function os_support() { | ||||||
|     zorin |     zorin | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| function os_homepages(){ | function os_homepage(){ | ||||||
|     local SIMPLE_NAME="" |     local SIMPLE_NAME="" | ||||||
|     local HOMEPAGE="" |     local HOMEPAGE="" | ||||||
|     SIMPLE_NAME="${1}" |     SIMPLE_NAME="${1}" | ||||||
|  | @ -351,7 +360,7 @@ function os_homepages(){ | ||||||
|         bunsenlabs)        HOMEPAGE="https://www.bunsenlabs.org/";; |         bunsenlabs)        HOMEPAGE="https://www.bunsenlabs.org/";; | ||||||
|         cachyos)           HOMEPAGE="https://cachyos.org/";; |         cachyos)           HOMEPAGE="https://cachyos.org/";; | ||||||
|         centos-stream)     HOMEPAGE="https://www.centos.org/centos-stream/";; |         centos-stream)     HOMEPAGE="https://www.centos.org/centos-stream/";; | ||||||
|         cereues)           HOMEPAGE="https://sourceforge.net/projects/cereus-linux/";; |         cereues)           HOMEPAGE="https://cereus-linux.sourceforge.io/";; | ||||||
|         chimeralinux)      HOMEPAGE="https://chimera-linux.org/";; |         chimeralinux)      HOMEPAGE="https://chimera-linux.org/";; | ||||||
|         crunchbang++)      HOMEPAGE="https://www.crunchbangplusplus.org/";; |         crunchbang++)      HOMEPAGE="https://www.crunchbangplusplus.org/";; | ||||||
|         debian)            HOMEPAGE="https://www.debian.org/";; |         debian)            HOMEPAGE="https://www.debian.org/";; | ||||||
|  | @ -381,6 +390,7 @@ function os_homepages(){ | ||||||
|         linuxlite)         HOMEPAGE="https://www.linuxliteos.com/";; |         linuxlite)         HOMEPAGE="https://www.linuxliteos.com/";; | ||||||
|         linuxmint)         HOMEPAGE="https://linuxmint.com/";; |         linuxmint)         HOMEPAGE="https://linuxmint.com/";; | ||||||
|         lmde)              HOMEPAGE="https://www.linuxmint.com/download_lmde.php";; |         lmde)              HOMEPAGE="https://www.linuxmint.com/download_lmde.php";; | ||||||
|  |         lubuntu)           HOMEPAGE="https://lubuntu.me/";; | ||||||
|         mageia)            HOMEPAGE="https://www.mageia.org/";; |         mageia)            HOMEPAGE="https://www.mageia.org/";; | ||||||
|         manjaro)           HOMEPAGE="https://manjaro.org/";; |         manjaro)           HOMEPAGE="https://manjaro.org/";; | ||||||
|         mxlinux)           HOMEPAGE="https://mxlinux.org/";; |         mxlinux)           HOMEPAGE="https://mxlinux.org/";; | ||||||
|  | @ -389,7 +399,6 @@ function os_homepages(){ | ||||||
|         netbsd)            HOMEPAGE="https://www.netbsd.org/";; |         netbsd)            HOMEPAGE="https://www.netbsd.org/";; | ||||||
|         nitrux)            HOMEPAGE="https://nxos.org/";; |         nitrux)            HOMEPAGE="https://nxos.org/";; | ||||||
|         nixos)             HOMEPAGE="https://nixos.org/";; |         nixos)             HOMEPAGE="https://nixos.org/";; | ||||||
|         lubuntu)           HOMEPAGE="https://lubuntu.me/";; |  | ||||||
|         macos)             HOMEPAGE="https://www.apple.com/macos/";; |         macos)             HOMEPAGE="https://www.apple.com/macos/";; | ||||||
|         openbsd)           HOMEPAGE="https://www.openbsd.org/";; |         openbsd)           HOMEPAGE="https://www.openbsd.org/";; | ||||||
|         openindiana)       HOMEPAGE="https://www.openindiana.org/";; |         openindiana)       HOMEPAGE="https://www.openindiana.org/";; | ||||||
|  | @ -961,6 +970,15 @@ function editions_solus() { | ||||||
|     echo Budgie GNOME MATE Plasma |     echo Budgie GNOME MATE Plasma | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | function releases_sparkylinux() { | ||||||
|  |     local SPARKY_RELEASES=$(wget -qO- "https://sourceforge.net/projects/sparkylinux/rss?path=/" | grep 'link' | grep '.iso' | cut -d'-' -f2 | uniq | tr '\r\n' ' ') | ||||||
|  |     echo "${SPARKY_RELEASES}" | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | function editions_sparkylinux() { | ||||||
|  |     echo lxqt mate xfce kde minimalgui minimalcli gameover multimedia rescue | ||||||
|  | } | ||||||
|  | 
 | ||||||
| function releases_spiral() { | function releases_spiral() { | ||||||
|     echo latest |     echo latest | ||||||
| } | } | ||||||
|  | @ -1094,7 +1112,11 @@ function check_hash() { | ||||||
|     local iso="" |     local iso="" | ||||||
|     local hash="" |     local hash="" | ||||||
|     local hash_algo="" |     local hash_algo="" | ||||||
|  |     if [ "${download_iso}" == "on" ]; then | ||||||
|  |         iso="${1}" | ||||||
|  |     else | ||||||
|         iso="${VM_PATH}/${1}" |         iso="${VM_PATH}/${1}" | ||||||
|  |     fi | ||||||
|     hash="${2}" |     hash="${2}" | ||||||
| 
 | 
 | ||||||
|     # Guess the hash algorithm by the hash length |     # Guess the hash algorithm by the hash length | ||||||
|  | @ -1135,9 +1157,11 @@ function web_get() { | ||||||
|     elif [ "${test_iso_url}" == 'on' ]; then |     elif [ "${test_iso_url}" == 'on' ]; then | ||||||
|         wget --spider "${URL}" |         wget --spider "${URL}" | ||||||
|         exit 0 |         exit 0 | ||||||
|  |     elif [ "${download_iso}" == 'on' ]; then | ||||||
|  |         DIR="$(pwd)" | ||||||
|     fi |     fi | ||||||
| 
 | 
 | ||||||
|     if ! mkdir -p "${DIR}" 2>/dev/null; then |     if [ "${DIR}" != "$(pwd)" ] && ! mkdir -p "${DIR}" 2>/dev/null; then | ||||||
|       echo "ERROR! Unable to create directory ${DIR}" |       echo "ERROR! Unable to create directory ${DIR}" | ||||||
|       exit 1 |       exit 1 | ||||||
|     fi |     fi | ||||||
|  | @ -1207,6 +1231,10 @@ function make_vm_config() { | ||||||
|     local GUEST="" |     local GUEST="" | ||||||
|     local SEC_BOOT="" |     local SEC_BOOT="" | ||||||
| 
 | 
 | ||||||
|  |     if [ "${download_iso}" == "on" ]; then | ||||||
|  |         exit 0 | ||||||
|  |     fi | ||||||
|  | 
 | ||||||
|     IMAGE_FILE="${1}" |     IMAGE_FILE="${1}" | ||||||
|     ISO_FILE="${2}" |     ISO_FILE="${2}" | ||||||
|     case "${OS}" in |     case "${OS}" in | ||||||
|  | @ -2587,6 +2615,23 @@ function get_solus() { | ||||||
|     echo "${URL}/${ISO} ${HASH}" |     echo "${URL}/${ISO} ${HASH}" | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | function get_sparkylinux() { | ||||||
|  |     local EDITION="${1:-}" | ||||||
|  |     local HASH="" | ||||||
|  |     local ISO="" | ||||||
|  |     local URL="" | ||||||
|  | 
 | ||||||
|  |     ISO="sparkylinux-${RELEASE}-x86_64-${EDITION}.iso" | ||||||
|  |     case ${EDITION} in | ||||||
|  |       minimalcli) URL="https://sourceforge.net/projects/sparkylinux/files/cli";; | ||||||
|  |       minimalgui) URL="https://sourceforge.net/projects/sparkylinux/files/base";; | ||||||
|  |       *)   URL="https://sourceforge.net/projects/sparkylinux/files/${EDITION}";; | ||||||
|  |     esac | ||||||
|  | 
 | ||||||
|  |     HASH=$(wget -q -O- ${URL}/${ISO}.allsums.txt | head -2 | grep 'iso' | cut -d' ' -f1) | ||||||
|  |     echo "${URL}/${ISO}" "${HASH}" | ||||||
|  | } | ||||||
|  | 
 | ||||||
| function get_spiral() { | function get_spiral() { | ||||||
|     local EDITION="${1:-}" |     local EDITION="${1:-}" | ||||||
|     local HASH="" |     local HASH="" | ||||||
|  | @ -3374,15 +3419,12 @@ else | ||||||
|     echo -n " - Operating Systems: " |     echo -n " - Operating Systems: " | ||||||
|     os_support |     os_support | ||||||
|     echo " |     echo " | ||||||
|         You can also use this arguments: | You can also use these arguments | ||||||
|         Only show ISO download URL | --show-iso-url / -u <distro> <release> <edition> : Show ISO download URL | ||||||
|             --show-iso-url / -u {distro} {release} [edition] | --test-iso-url / -t <distro> <release> <edition> : Test if ISO is available | ||||||
|         Test if ISO is available | --download-iso / -d <distro> <release> <edition> : Download ISO | ||||||
|             --test-iso-url / -t {distro} {release} [edition] | --open-distro-homepage / -o <distro>             : Open distro homepage | ||||||
|         Open distro homepage | --show-distro-homepage / -s <distro>             : Show distro homepage link" | ||||||
|             --open-distro-homepage / -o {distro} |  | ||||||
|         Only show distro homepage link |  | ||||||
|             --show-distro-homepage / -s {distro}" |  | ||||||
|     exit 1 |     exit 1 | ||||||
| fi | fi | ||||||
| 
 | 
 | ||||||
|  | @ -3467,11 +3509,11 @@ if [ -n "${2}" ]; then | ||||||
|     fi |     fi | ||||||
| else | else | ||||||
|     if [ "${open_distro_homepage}" == 'on' ]; then |     if [ "${open_distro_homepage}" == 'on' ]; then | ||||||
|         HOMEPAGE=$(os_homepages ${OS}) |         HOMEPAGE=$(os_homepage ${OS}) | ||||||
|         open_url "${HOMEPAGE}" && exit 0 |         open_url "${HOMEPAGE}" && exit 0 | ||||||
|     fi |     fi | ||||||
|     if [ "${show_distro_homepage}" == 'on' ]; then |     if [ "${show_distro_homepage}" == 'on' ]; then | ||||||
|         HOMEPAGE=$(os_homepages ${OS}) |         HOMEPAGE=$(os_homepage ${OS}) | ||||||
|         echo "${HOMEPAGE}" && exit 0 |         echo "${HOMEPAGE}" && exit 0 | ||||||
|     fi |     fi | ||||||
|     echo "ERROR! You must specify a release." |     echo "ERROR! You must specify a release." | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue