Desktop package was not installed when changing beta/stable repository. Fixed

debian-config-functions

@@ -327,10 +327,12 @@ function reload_bsp(){
 		# if new packages are absent, reinstall old ones
 		if [[ -z $PACKAGE_LIST ]]; then
 			PACKAGE_LIST="linux-${DISTROID}-root$TARGET_BRANCH-$BOARD"
+			[[ -n $(apt-cache search --names-only "^armbian-${DISTROID}-desktop$") ]] && PACKAGE_LIST=$PACKAGE_LIST" armbian-${DISTROID}-desktop"
 		fi
 
 		# reinstall headers only if they are already installed
 		check_if_installed linux-headers${TARGET_BRANCH}-${TARGET_FAMILY} && PACKAGE_LIST=$PACKAGE_LIST" linux-headers${TARGET_BRANCH}-${TARGET_FAMILY}"
+
 		IFS=" "
 		[[ -n $(apt-cache search --names-only "^linux-dtb$TARGET_BRANCH-$TARGET_FAMILY") ]] && PACKAGE_LIST=$PACKAGE_LIST" linux-dtb$TARGET_BRANCH-$TARGET_FAMILY"
 		PACKAGE_LIST=$PACKAGE_LIST" linux-image${TARGET_BRANCH}-${TARGET_FAMILY}"
@@ -347,11 +349,13 @@ function reload_bsp(){
 				aptitude remove ~narmbian-${LINUXFAMILY} --quiet=100 -y >> /var/log/upgrade.log 2>&1
 				aptitude remove ~narmbian-${BOARD} --quiet=100 -y >> /var/log/upgrade.log 2>&1
 				aptitude remove ~narmbian-${DISTROID} --quiet=100 -y >> /var/log/upgrade.log 2>&1
+				aptitude remove ~narmbian-${DISTROID}-desktop --quiet=100 -y >> /var/log/upgrade.log 2>&1
 				aptitude remove ~narmbian-${DISTROID}-desktop-xfce --quiet=100 -y >> /var/log/upgrade.log 2>&1
                 # install packages
 				echo $PACKAGE_LIST >> /var/log/upgrade.log
                 debconf-apt-progress -- apt-get --reinstall -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \
                 -y -qq --no-install-recommends install $PACKAGE_LIST armbian-config
+                if [[ $? = 1 ]]; then echo "Something went wrong ... check logs."; exit; fi
                 dialog --title "Switching to $1" --backtitle "$BACKTITLE" --yes-label "Reboot" \
 				--no-label "Cancel" --yesno "\nReboot to apply new settings?" 7 34
                 if [[ $? = 0 ]]; then reboot; fi