Debug cleanup and breaking desktop install to mini and default (with browser)

debian-config-functions

@@ -397,7 +397,7 @@ function configure_desktop ()
 	if [ -n "$CHOSEN_USER" ]; then
 		# install desktop and nodm
 		debconf-apt-progress -- apt-get update
-		debconf-apt-progress -- apt-get -y install --install-recommends armbian-${DISTROID}-desktop
+		debconf-apt-progress -- apt-get -y install $1 armbian-${DISTROID}-desktop
 		DEBIAN_FRONTEND=noninteractive debconf-apt-progress -- apt-get -y -qq install nodm
 		# add user to groups
 		for additionalgroup in sudo netdev audio video dialout plugdev bluetooth systemd-journal ssh; do

debian-config-jobs

@@ -166,7 +166,6 @@ function jobs ()
 	#
 	"Full"|"Mini" )
 		if ! is_package_manager_running; then
-		echo "armbian-firmware$(echo -"${1,,}" | sed 's/-mini//')"
 			debconf-apt-progress -- apt-get -y purge armbian-firmware* # workaround since pkg replace deesn't work properly
 			debconf-apt-progress -- apt-get -y install armbian-firmware$(echo -"${1,,}" | sed 's/-mini//')
 		fi
@@ -764,13 +763,18 @@ function jobs ()
 					debconf-apt-progress -- apt-get -o Dpkg::Options::="--force-confold" -y --no-install-recommends install nodm \
 					&& echo "/usr/sbin/nodm" > /etc/X11/default-display-manager && \
 					sed -i "s/^NODM_ENABLED=.*/NODM_ENABLED=true/" /etc/default/nodm && service nodm start
-				else
-					configure_desktop
-				fi
 			fi
 		fi
 	;;
 
+	"Minimal" )
+	configure_desktop
+	;;
+
+	"Default")
+	configure_desktop "--install-recommends"
+	;;
+
 
 	"Nodm" )
 		[[ -f /etc/X11/default-display-manager ]] && echo "/usr/sbin/nodm" > /etc/X11/default-display-manager

debian-config-submenu

@@ -78,8 +78,14 @@ while true; do
 	else
 			if [[ -n $DESKTOP_INSTALLED ]]; then
 															LIST+=( "Desktop" "Enable desktop" )
+															if ! check_if_installed mpv ; then
+																LIST+=( "Default" "Install desktop with browser and extras" )
+															fi
 				else
-															LIST+=( "Desktop" "Install desktop" )
+															LIST+=( "Minimal" "Install minimal desktop" )
+															if ! check_if_installed mpv ; then
+																LIST+=( "Default" "Install desktop with browser and extras" )
+															fi
 			fi
 	fi