buidiso: minor fixes

bin/buildiso.in

@@ -133,7 +133,7 @@ usage() {
 	echo '    -c                 Disable clean work dir'
 	echo '    -x                 Build images only'
 	echo '    -z                 Generate iso only'
-	echo '                       Requires pre built images (-i)'
+	echo '                       Requires pre built images (-x)'
 	echo '    -v                 Verbose output, show profies detail (-q)'
 	echo '    -q                 Query settings and pretend build'
 	echo '    -h                 This help'

lib/util-iso-image.sh

@@ -195,6 +195,9 @@ detect_desktop_env(){
 			if [[ -f $xs/$key.desktop ]] && [[ -f $ex/$val ]];then
 				default_desktop_file="$key"
 				default_desktop_executable="$val"
+			else
+				default_desktop_file="none"
+				default_desktop_executable="none"
 			fi
 		done
 	fi

lib/util.sh

@@ -239,8 +239,6 @@ unset_profile(){
 	unset pxe_boot
 	unset plymouth_boot
 	unset nonfree_xorg
-	unset default_desktop_executable
-	unset default_desktop_file
 	unset efi_boot_loader
 	unset efi_part_size
 	unset hostname
@@ -254,7 +252,6 @@ unset_profile(){
 	unset disable_openrc
 	unset start_systemd_live
 	unset start_openrc_live
-	unset use_overlayfs
 	unset packages_custom
 	unset packages_mhwd
 }