mirror of
				https://github.com/oSoWoSo/DistroHopper.git
				synced 2024-08-14 22:46:53 +00:00 
			
		
		
		
	Merge pull request #323 from philclifford/merging-fixes
Merging fixes - Consolidated PR of some pending bug fixes
This commit is contained in:
		
						commit
						a624bf69a7
					
				
					 2 changed files with 3 additions and 2 deletions
				
			
		
							
								
								
									
										2
									
								
								quickemu
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								quickemu
									
										
									
									
									
								
							|  | @ -1136,7 +1136,7 @@ fi | ||||||
| # TODO: Make this run the native architecture binary | # TODO: Make this run the native architecture binary | ||||||
| QEMU=$(command -v qemu-system-x86_64) | QEMU=$(command -v qemu-system-x86_64) | ||||||
| QEMU_IMG=$(command -v qemu-img) | QEMU_IMG=$(command -v qemu-img) | ||||||
| if [ ! -e "${QEMU}" ] && [ ! -e "${QEMU_IMG}" ]; then | if [ ! -e "${QEMU}" ] || [ ! -e "${QEMU_IMG}" ]; then | ||||||
|   echo "ERROR! QEMU not found. Please make install qemu-system-x86_64 and qemu-img" |   echo "ERROR! QEMU not found. Please make install qemu-system-x86_64 and qemu-img" | ||||||
|   exit 1 |   exit 1 | ||||||
| fi | fi | ||||||
|  |  | ||||||
							
								
								
									
										3
									
								
								quickget
									
										
									
									
									
								
							
							
						
						
									
										3
									
								
								quickget
									
										
									
									
									
								
							|  | @ -286,6 +286,7 @@ function releases_debian() { | ||||||
|     standard \ |     standard \ | ||||||
|     xfce |     xfce | ||||||
| } | } | ||||||
|  | 
 | ||||||
| function releases_cachyos() { | function releases_cachyos() { | ||||||
|     echo 2022.01.09 |     echo 2022.01.09 | ||||||
| } | } | ||||||
|  | @ -589,7 +590,7 @@ function zsync_get() { | ||||||
|       fi |       fi | ||||||
|     else |     else | ||||||
|       echo "INFO: zsync not found, falling back to wget" |       echo "INFO: zsync not found, falling back to wget" | ||||||
|       web_get "${ISO}" |       web_get "${ISO}" "${DIR}" | ||||||
|     fi |     fi | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue