dietpi-software: Add support for automatied APT package installs

- DietPi-Software | The new AUTO_SETUP_APT_INSTALLS dietpi.txt setting can now be used to have APT packages automatically installed after the first run setup of DietPi systems. See dietpi.txt for details.
- DietPi-Software | The AUTO_SETUP_INSTALL_SOFTWARE_ID dietpi.txt settings now allows to define multiple software IDs in a single line, separated by space. For now, multiple AUTO_SETUP_INSTALL_SOFTWARE_ID lines are still supported, but this will change in the future. If you keep a dietpi.txt for future DietPi instances, and make use of the AUTO_SETUP_INSTALL_SOFTWARE_ID setting, please update it accordingly.

Author: MichaIng

CHANGELOG.txt

@@ -4,6 +4,8 @@ v9.10
 Enhancements:
 - RISC-V | Debian Trixie does now support this architecture, hence our VisionFive 2 and Star64 images are now provided with Debian Trixie/testing instead of Debian Sid/unstable, and existing systems will be migrated to the Trixie suite.
 - RISC-V | Additional software options have been enabled for RISC-V systems: Bazarr, Raspotify, NZBGet, MicroK8s and AdGuard Home
+- DietPi-Software | The new AUTO_SETUP_APT_INSTALLS dietpi.txt setting can now be used to have APT packages automatically installed after the first run setup of DietPi systems. See dietpi.txt for details.
+- DietPi-Software | The AUTO_SETUP_INSTALL_SOFTWARE_ID dietpi.txt settings now allows to define multiple software IDs in a single line, separated by space. For now, multiple AUTO_SETUP_INSTALL_SOFTWARE_ID lines are still supported, but this will change in the future. If you keep a dietpi.txt for future DietPi instances, and make use of the AUTO_SETUP_INSTALL_SOFTWARE_ID setting, please update it accordingly.
 - DietPi-Software | myMPD: We enabled the software option for ARMv6 Bookworm systems, since packages for Raspbian Bookworm are now available. Many thanks to @hackslikeus for bringing up the topic: https://github.com/MichaIng/DietPi/issues/7345
 - DietPi-Software | vaultwarden: Our builds will now show the package version within the web UI. Many thanks to @gh3597 for reporting it missing and how to add it: https://github.com/MichaIng/DietPi/issues/7364
 

dietpi.txt

@@ -59,6 +59,12 @@ AUTO_SETUP_HEADLESS=0
 # Unmask (enable) systemd-logind service (including dbus), which is masked by default on DietPi
 AUTO_UNMASK_LOGIND=0
 
+# Install APT packages automatically after first run setup.
+# - Add as many APT package names as you wish, separated by space.
+# - They will be installed after dietpi-software options and before the script defined via AUTO_SETUP_CUSTOM_SCRIPT_EXEC (see below) is executed.
+# - E.g. the following (without the leading "#") will install the APT packages iotop, iptables and xz-utils:
+#AUTO_SETUP_APT_INSTALLS=iotop iptables xz-utils
+
 # Custom Script (pre-networking and pre-DietPi install)
 # - Allows you to automatically execute a custom script before network is up on first boot.
 # - Copy your script to /boot/Automation_Custom_PreScript.sh and it will be executed automatically.
@@ -111,14 +117,14 @@ AUTO_SETUP_AUTOSTART_TARGET_INDEX=0
 AUTO_SETUP_AUTOSTART_LOGIN_USER=root
 
 ##### Non-interactive first run setup #####
-# On first login, run update, initial setup and software installs without any user input
+# On first boot, run update, initial setup and software installs without any user interaction.
 # - Setting this to "1" is required for AUTO_SETUP_GLOBAL_PASSWORD and AUTO_SETUP_INSTALL_SOFTWARE_ID.
 # - Setting this to "1" indicates that you accept the DietPi GPLv2 license, available at /boot/dietpi-LICENSE.txt, superseding AUTO_SETUP_ACCEPT_LICENSE.
 AUTO_SETUP_AUTOMATED=0
 
-# Global password to be applied for the system
+# On first boot, apply this password for login users and software installs automatically.
 # - Requires AUTO_SETUP_AUTOMATED=1
-# - Affects "root" and "dietpi" users login passwords and is used by dietpi-software as default for software installs which require a password.
+# - Affects "root" and "dietpi" user's login passwords and is used by dietpi-software as default for software installs which require a password.
 # - During first run setup, the password is removed from this file and instead encrypted and saved to root filesystem.
 # - WARN: The default SSH server Dropbear does not support passwords over 100 characters.
 # - WARN: We cannot guarantee that all software options can handle special characters like \"$.
@@ -127,10 +133,10 @@ AUTO_SETUP_GLOBAL_PASSWORD=dietpi
 # Software to automatically install
 # - Requires AUTO_SETUP_AUTOMATED=1
 # - List of available software IDs: https://github.com/MichaIng/DietPi/wiki/DietPi-Software-list
-# - Add as many entries as you wish, one each line.
+# - Add as many software IDs as you wish, separated by space.
 # - DietPi will automatically install all dependencies, like ALSA/X11 for desktops etc.
-# - E.g. the following (without the leading "#") will install the LXDE desktop automatically on first boot:
-#AUTO_SETUP_INSTALL_SOFTWARE_ID=23
+# - E.g. the following (without the leading "#") will install the LXDE desktop, the TigerVNC server and the Kodi media centre automatically on first boot:
+#AUTO_SETUP_INSTALL_SOFTWARE_ID=23 28 31
 
 #------------------------------------------------------------------------------------------------------
 ##### Misc DietPi program settings #####

dietpi/dietpi-software

@@ -14644,30 +14644,34 @@ _EOF_
 
 		# Find all software entries of AUTO_SETUP_INSTALL_SOFTWARE_ID= in dietpi.txt. Then set to state 1 for installation.
 		G_DIETPI-NOTIFY 2 'Checking AUTO_SETUP_INSTALL_SOFTWARE_ID entries'
-		while read -r software_id
+		# - Pre-v9.10: Support multiple AUTO_SETUP_INSTALL_SOFTWARE_ID lines
+		while read -ra software_ids
 		do
-			# Skip if software does not exist, is not supported on architecture, hardware model or Debian version
-			if [[ ! ${aSOFTWARE_NAME[$software_id]} ]]
-			then
-				G_DIETPI-NOTIFY 1 "Software title with ID $software_id does not exist. Skipping it."
-
-			elif (( ! ${aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,$G_HW_ARCH]:=1} ))
-			then
-				G_DIETPI-NOTIFY 1 "Software title ${aSOFTWARE_NAME[$software_id]} is not supported on $G_HW_ARCH_NAME systems. Skipping it."
+			# v9.10: Support multiple IDs per AUTO_SETUP_INSTALL_SOFTWARE_ID line
+			for software_id in "${software_ids[@]}"
+			do
+				# Skip if software does not exist, is not supported on architecture, hardware model or Debian version
+				if [[ ! ${aSOFTWARE_NAME[$software_id]} ]]
+				then
+					G_DIETPI-NOTIFY 1 "Software title with ID $software_id does not exist. Skipping it."
 
-			elif (( ! ${aSOFTWARE_AVAIL_G_HW_MODEL[$software_id,$G_HW_MODEL]:=1} ))
-			then
-				G_DIETPI-NOTIFY 1 "Software title ${aSOFTWARE_NAME[$software_id]} is not supported on $G_HW_MODEL_NAME. Skipping it."
+				elif (( ! ${aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,$G_HW_ARCH]:=1} ))
+				then
+					G_DIETPI-NOTIFY 1 "Software title ${aSOFTWARE_NAME[$software_id]} is not supported on ${RPI_64KERNEL_32OS:-$G_HW_ARCH_NAME} systems. Skipping it."
 
-			elif (( ! ${aSOFTWARE_AVAIL_G_DISTRO[$software_id,$G_DISTRO]:=1} )); then
+				elif (( ! ${aSOFTWARE_AVAIL_G_HW_MODEL[$software_id,$G_HW_MODEL]:=1} ))
+				then
+					G_DIETPI-NOTIFY 1 "Software title ${aSOFTWARE_NAME[$software_id]} is not supported on $G_HW_MODEL_NAME. Skipping it."
 
-				G_DIETPI-NOTIFY 1 "Software title ${aSOFTWARE_NAME[$software_id]} is not supported on Debian ${G_DISTRO_NAME^}. Skipping it."
-			else
-				aSOFTWARE_INSTALL_STATE[$software_id]=1
-				G_DIETPI-NOTIFY 0 "Software title ${aSOFTWARE_NAME[$software_id]} flagged for installation."
-			fi
+				elif (( ! ${aSOFTWARE_AVAIL_G_DISTRO[$software_id,$G_DISTRO]:=1} )); then
 
-		done < <(grep '^[[:blank:]]*AUTO_SETUP_INSTALL_SOFTWARE_ID=' /boot/dietpi.txt | mawk '{print $1}' | sed 's/[^0-9]*//g')
+					G_DIETPI-NOTIFY 1 "Software title ${aSOFTWARE_NAME[$software_id]} is not supported on Debian ${G_DISTRO_NAME^}. Skipping it."
+				else
+					aSOFTWARE_INSTALL_STATE[$software_id]=1
+					G_DIETPI-NOTIFY 0 "Software title ${aSOFTWARE_NAME[$software_id]} flagged for installation."
+				fi
+			done
+		done < <(grep '^[[:blank:]]*AUTO_SETUP_INSTALL_SOFTWARE_ID=' /boot/dietpi.txt | sed -e 's/^[^=]*=//' -e 's/#.*$//')
 	}
 
 	# Setup steps after software installs
@@ -14806,6 +14810,14 @@ _EOF_
 
 		G_DIETPI-NOTIFY 0 'Applied final first run setup steps'
 
+		# Process automatic APT package installs
+		local packages=() package
+		read -ra packages < <($(sed -n '/^[[:blank:]]*AUTO_SETUP_APT_INSTALLS=/{s/^[^=]*=//p;q}' /boot/dietpi.txt)
+		for package in "${packages[@]}"
+		do
+			G_EXEC_NOHALT=1 G_AGI "$package"
+		done
+
 		# Custom 1st run script
 		[[ $AUTOINSTALL_CUSTOMSCRIPTURL != '0' || -f '/boot/Automation_Custom_Script.sh' ]] || return 0