mirror of
				https://github.com/oSoWoSo/DistroHopper.git
				synced 2024-08-14 22:46:53 +00:00 
			
		
		
		
	run in terminal option
This commit is contained in:
		
							parent
							
								
									028ae25446
								
							
						
					
					
						commit
						bed6ef56ff
					
				
					 1 changed files with 49 additions and 5 deletions
				
			
		
							
								
								
									
										52
									
								
								dh
									
										
									
									
									
								
							
							
						
						
									
										52
									
								
								dh
									
										
									
									
									
								
							|  | @ -107,17 +107,35 @@ function create_structure() { | ||||||
| 
 | 
 | ||||||
| function dh_desktop_entry() { | function dh_desktop_entry() { | ||||||
| 	cat <<EOF > ${TMP_DIR}/dh.desktop | 	cat <<EOF > ${TMP_DIR}/dh.desktop | ||||||
|  | 	echo $"Do you want DistroHopper to run in the terminal? (y/n)" | ||||||
|  | 	run_in_terminal | ||||||
|  | 	if [ "$interminal" == "yes" ]; then | ||||||
|  | 		cat <<EOF > ${TMP_DIR}/dh.desktop | ||||||
| [Desktop Entry] | [Desktop Entry] | ||||||
| Type=Application | Type=Application | ||||||
| Name=DistroHopper | Name=DistroHopper | ||||||
| Description=Quickly download, create and run VM of any#TODO operating system. | Description=Quickly download, create and run VM of any#TODO operating system. | ||||||
| version=0.77b | version=0.77b | ||||||
| Exec=sh -c 'cd ${VMS_DIR} && exec dh g' | Terminal=true | ||||||
| Icon=/home/zen/git/distrohopper/icons/hop.svg | Exec=sh -c 'cd ${VMS_DIR} && dh g' | ||||||
|  | Icon=/home/zen/git/distrohopper/icons/hop | ||||||
| Categories=System;Virtualization; | Categories=System;Virtualization; | ||||||
| 
 | 
 | ||||||
| EOF | EOF | ||||||
| 	sudo cp dh.desktop /usr/share/applications/ | 	else | ||||||
|  | 		cat <<EOF > ${TMP_DIR}/dh.desktop | ||||||
|  | [Desktop Entry] | ||||||
|  | Type=Application | ||||||
|  | Name=DistroHopper | ||||||
|  | Description=Quickly download, create and run VM of any#TODO operating system. | ||||||
|  | version=0.77b | ||||||
|  | Exec=sh -c 'cd ${VMS_DIR} && dh g' | ||||||
|  | Icon=/home/zen/git/distrohopper/icons/hop | ||||||
|  | Categories=System;Virtualization; | ||||||
|  | 
 | ||||||
|  | EOF | ||||||
|  | 	fi | ||||||
|  | 	sudo cp ${TMP_DIR}/dh.desktop /usr/share/applications/ | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| function set_dir() { | function set_dir() { | ||||||
|  | @ -184,7 +202,19 @@ function install_process() { | ||||||
| 	 && dh_desktop_entry | 	 && dh_desktop_entry | ||||||
| } | } | ||||||
| # basic ----------------------------------- | # basic ----------------------------------- | ||||||
|  | 
 | ||||||
|  | function run_in_terminal() { | ||||||
|  | 	read -r response | ||||||
|  | 	if [[ "$response" =~ ^[YyAa]$ ]]; then | ||||||
|  | 		interminal="yes" | ||||||
|  | 	else | ||||||
|  | 		interminal="no" | ||||||
|  | 	fi | ||||||
|  | } | ||||||
|  | 
 | ||||||
| function renew_ready() { | function renew_ready() { | ||||||
|  | 	echo $"Do you want quickemu to show outputs in the terminal? (y/n)" | ||||||
|  | 	run_in_terminal | ||||||
| 	cd "$VMS_DIR" || exit 1 | 	cd "$VMS_DIR" || exit 1 | ||||||
| #	for files in "$VMS_DIR"/*; do | #	for files in "$VMS_DIR"/*; do | ||||||
| #	if [ ! -e *.conf ]; then | #	if [ ! -e *.conf ]; then | ||||||
|  | @ -207,6 +237,18 @@ function renew_ready() { | ||||||
| 			icon_file="$DH_ICON_DIR/tux.svg" | 			icon_file="$DH_ICON_DIR/tux.svg" | ||||||
| 		fi | 		fi | ||||||
| 		# content of desktop files (ready to run VMs) | 		# content of desktop files (ready to run VMs) | ||||||
|  | 		if [ "$interminal" == "yes" ]; then | ||||||
|  | 			cat <<EOF > "$DH_CONFIG_DIR"/ready/"$vm_desktop".desktop | ||||||
|  | [Desktop Entry] | ||||||
|  | Type=Application | ||||||
|  | Name=$vm_desktop | ||||||
|  | Terminal=true | ||||||
|  | Exec=sh -c 'cd ${VMS_DIR} && ${portable_prefix}quickemu -vm ${vm_conf}' | ||||||
|  | Icon=$icon_file | ||||||
|  | Categories=System;Virtualization; | ||||||
|  | 
 | ||||||
|  | EOF | ||||||
|  | 		else | ||||||
| 			cat <<EOF > "$DH_CONFIG_DIR"/ready/"$vm_desktop".desktop | 			cat <<EOF > "$DH_CONFIG_DIR"/ready/"$vm_desktop".desktop | ||||||
| [Desktop Entry] | [Desktop Entry] | ||||||
| Type=Application | Type=Application | ||||||
|  | @ -216,10 +258,13 @@ Icon=$icon_file | ||||||
| Categories=System;Virtualization; | Categories=System;Virtualization; | ||||||
| 
 | 
 | ||||||
| EOF | EOF | ||||||
|  | 		fi | ||||||
| 	done | 	done | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| function renew_supported() { | function renew_supported() { | ||||||
|  | 	echo $"Do you want quickget to show outputs in the terminal? (y/n)" | ||||||
|  | 	run_in_terminal | ||||||
| 	# get supported VMs | 	# get supported VMs | ||||||
| 	"$portable_prefix"quickget | sed 1d | cut -d':' -f2 | grep -o '[^ ]*' > "$DH_CONFIG_DIR/supported.md" | 	"$portable_prefix"quickget | sed 1d | cut -d':' -f2 | grep -o '[^ ]*' > "$DH_CONFIG_DIR/supported.md" | ||||||
| 	while read -r get_name; do | 	while read -r get_name; do | ||||||
|  | @ -238,7 +283,6 @@ function renew_supported() { | ||||||
| 		echo "" | 		echo "" | ||||||
| 		# Check if there are editions | 		# Check if there are editions | ||||||
| 		if [ -z "$editions" ]; then | 		if [ -z "$editions" ]; then | ||||||
| # use terminal instead: xargs -I{} $TERMINAL -e "${portable_prefix}quickget $get_name {}"' |  | ||||||
| 			cat <<EOF > "$DH_CONFIG_DIR"/supported/"$vm_desktop".desktop | 			cat <<EOF > "$DH_CONFIG_DIR"/supported/"$vm_desktop".desktop | ||||||
| [Desktop Entry] | [Desktop Entry] | ||||||
| Type=Application | Type=Application | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue