v6.22 (#2648)

Beta v6.22.3

CHANGELOG.txt

@@ -24,6 +24,7 @@ Changes / Improvements / Optimisations:
 - DietPi-Software | rTorrent: Runs now as user "rtorrent" and creates files as group "dietpi" with 775/664 permissions. Enabled Buster support and enhanced config file handling on reinstall: https://github.com/MichaIng/DietPi/pull/2633
 - DietPi-Software | Plex Media Server: Now installs the latest version automatically (currently 1.15) which as well includes official ARM binaries. Many thanks to @WolfganP for informing us about this new release: https://github.com/MichaIng/DietPi/issues/2553
 - DietPi-Software | Nextcloud: Resolved an admin panel warning about missing ocm/ocs-provider redirects. Many thanks to @minnux for reporting this issue: https://github.com/MichaIng/DietPi/issues/2638
+- DietPi-Software | Allo GUI: Updated to version 13. Provides for view the USB status and sound card status on Dietpi Allo web GUI system status page. Many thanks to @sudeep!: https://github.com/sparky-sbc/sparky-test/tree/master/dietpi-gui-usbdebug
 
 Bug Fixes:
 - System | Resolved an issue where /etc/bashrc.d entries could be run multiple times. Many thanks to @jonare77 for reporting this issue: https://github.com/MichaIng/DietPi/issues/2529
@@ -56,6 +57,8 @@ Known/Outstanding Issues:
 - DietPi-Drive_Manager | encryptfs is currently not supported and will be removed from fstab when executing drive manager: https://github.com/MichaIng/DietPi/issues/2078
 - RPi | LXAppearance (on LXDE desktop) hangs on dbus-launch: https://github.com/MichaIng/DietPi/issues/1791
 - Odroid C2 | Some WiFi adapters do no work as hotspot: https://github.com/MichaIng/DietPi/issues/1955
+- Odroid XU4 | Kodi freezes shortly on video playback: https://github.com/MichaIng/DietPi/issues/2584
+- Rock64 | 3.5mm A/V jack is currently not functional: https://github.com/MichaIng/DietPi/issues/2522
 - DietPi-Software | Node-RED: Pre-installed modules cannot be updated via web UI: https://github.com/MichaIng/DietPi/issues/2073
 - DietPi-Software | Raspimjpeg: With Lighttpd, streaming mjpeg does not work: https://github.com/MichaIng/DietPi/issues/1747
 

dietpi/dietpi-software

@@ -6147,7 +6147,7 @@ Pin-Priority: -1' > /etc/apt/preferences.d/dietpi-docker_fix
 			${aSOFTWARE_INSTALL_STATE[160]} == 1 )); then
 
 			Banner_Installing
-			Download_Install 'https://dietpi.com/downloads/binaries/all/allo_web_interface_v12.7z' /var/www
+			Download_Install 'https://dietpi.com/downloads/binaries/all/allo_web_interface_v13.7z' /var/www
 
 		fi
 
@@ -10990,7 +10990,7 @@ SCGIMount /RPC2 127.0.0.1:5000
 </location>
 _EOF_
 				a2ensite dietpi-rutorrent
-				
+
 			# - Lighttpd
 			elif (( ${aSOFTWARE_INSTALL_STATE[84]} > 0 )); then
 

dietpi/func/dietpi-banner

@@ -48,7 +48,19 @@
 	# Set defaults
 	aENABLED=(1 0 1 0 0 1 0 0 0 0 0 1)
 
-	GREEN_LINE=' \e[38;5;154m─────────────────────────────────────────────────────\e[0m'
+	COLOUR_RESET='\e[0m'
+	aCOLOUR=(
+
+		'\e[38;5;154m'	# DietPi green	| Lines, bullets and seperators
+		'\e[1m'		# Bold white	| Main descriptions
+		'\e[90m'	# Grey		| Credits
+		'\e[91m'	# Red		| Update notifications
+
+	)
+
+	GREEN_LINE=" ${aCOLOUR[0]}─────────────────────────────────────────────────────$COLOUR_RESET"
+	GREEN_BULLET=" ${aCOLOUR[0]}-$COLOUR_RESET"
+	GREEN_SEPERATOR="${aCOLOUR[0]}:$COLOUR_RESET"
 
 	. /DietPi/dietpi/.version
 	DIETPI_VERSION="$G_DIETPI_VERSION_CORE.$G_DIETPI_VERSION_SUB.$G_DIETPI_VERSION_RC"
@@ -84,6 +96,13 @@
 		# Safe custom entry description
 		echo "aDESCRIPTION[10]='${aDESCRIPTION[10]}'" >> $FP_SAVEFILE
 
+		for i in ${!aCOLOUR[@]}
+		do
+
+			echo "aCOLOUR[$i]='${aCOLOUR[$i]}'" >> $FP_SAVEFILE
+
+		done
+
 	}
 
 	Print_Header(){
@@ -95,11 +114,11 @@
 
 			if [[ $UPDATE_AVAILABLE_VERSION == '-1' ]]; then
 
-				text_update_available_date='\e[1;33mImage available\e[0m'
+				text_update_available_date="${aCOLOUR[3]}Image available"
 
 			else
 
-				text_update_available_date='\e[1;33mUpdate available\e[0m'
+				text_update_available_date="${aCOLOUR[3]}Update available"
 
 			fi
 
@@ -110,14 +129,14 @@
 		fi
 
 		echo -e "$GREEN_LINE
- \e[1mDietPi v$DIETPI_VERSION\e[0m \e[90m| $text_update_available_date\e[0m
+ ${aCOLOUR[1]}DietPi v$DIETPI_VERSION$COLOUR_RESET $GREEN_SEPERATOR $text_update_available_date$COLOUR_RESET
 $GREEN_LINE"
 
 	}
 
 	Print_Credits(){
 
-		echo -e ' \e[90mDietPi Team     : MichaIng (lead), Daniel Knight (founder)'
+		echo -e " ${aCOLOUR[2]}DietPi Team     : MichaIng (lead), Daniel Knight (founder)"
 
 		[[ -f /DietPi/dietpi/.prep_info ]] && mawk 'NR==1 {sub(/^0$/,"DietPi Core Team");a=$0} NR==2 {print " Image           : "a" (pre-image: "$0")"}' /DietPi/dietpi/.prep_info
 
@@ -128,18 +147,18 @@ $GREEN_LINE"
 		local image_additional_credits=$(sed -n 8p /DietPi/dietpi/.hw_model)
 		[[ $image_additional_credits ]] && echo " Device image possible thanks to: $image_additional_credits"
 
-		echo -e ' DietPi Hosting  : Powered by https://MyVirtualServer.com\e[0m\n'
+		echo -e " DietPi Hosting  : Powered by https://MyVirtualServer.com$COLOUR_RESET\n"
 
 		# Update available?
 		if (( $UPDATE_AVAILABLE )); then
 
 			if [[ $UPDATE_AVAILABLE_VERSION = '-1' ]]; then
 
-				echo -e ' \e[1;31mUpdated DietPi image is available, please download it:\e[0m\n https://dietpi.com/#download\n'
+				echo -e " ${aCOLOUR[3]}Updated DietPi image is available, please download it:$COLOUR_RESET\n https://dietpi.com/#download\n"
 
 			else
 
-				echo -e " \e[1mdietpi-update\e[0m    = \e[1;31mRun now to update DietPi (from v$DIETPI_VERSION to v$UPDATE_AVAILABLE_VERSION).\e[0m"
+				echo -e " ${aCOLOUR[1]}dietpi-update$COLOUR_RESET   $GREEN_SEPERATOR ${aCOLOUR[3]}Run now to update DietPi from v$DIETPI_VERSION to v$UPDATE_AVAILABLE_VERSION.$COLOUR_RESET\n"
 
 			fi
 
@@ -149,18 +168,16 @@ $GREEN_LINE"
 
 	Print_Useful_Commands(){
 
-		echo -e '\e[1m dietpi-launcher\e[0m  = All the DietPi programs in one place.
- \e[1mdietpi-config\e[0m    = Feature rich configuration tool for your device.
- \e[1mdietpi-software\e[0m  = Select optimized software for installation.
- \e[1mhtop\e[0m             = Resource monitor.
- \e[1mcpu\e[0m              = Shows CPU information and stats.\n'
+		echo -e "${aCOLOUR[1]} dietpi-launcher$COLOUR_RESET $GREEN_SEPERATOR All the DietPi programs in one place.
+ ${aCOLOUR[1]}dietpi-config$COLOUR_RESET   $GREEN_SEPERATOR Feature rich configuration tool for your device.
+ ${aCOLOUR[1]}dietpi-software$COLOUR_RESET $GREEN_SEPERATOR Select optimized software for installation.
+ ${aCOLOUR[1]}htop$COLOUR_RESET            $GREEN_SEPERATOR Resource monitor.
+ ${aCOLOUR[1]}cpu$COLOUR_RESET             $GREEN_SEPERATOR Shows CPU information and stats.\n"
 
 	}
 
 	Print_Banner(){
 
-		local green_bullet=' \e[38;5;154m-\e[0m'
-
 		# - Source DietPi-Globals if CPU temp chosen
 		[[ ${aENABLED[2]} != 1 || $G_PROGRAM_NAME ]] || . /DietPi/dietpi/func/dietpi-globals
 
@@ -170,17 +187,17 @@ $GREEN_LINE"
 		printf '\ec' # clear current terminal screen
 		Print_Header
 
-		(( ${aENABLED[0]} == 1 )) && echo -e "$green_bullet \e[1m${aDESCRIPTION[0]} \e[90m| $(mawk 'NR==2 {print $0}' /DietPi/dietpi/.hw_model 2>&1)\e[0m"				#0: Device model
-		(( ${aENABLED[1]} == 1 )) && echo -e "$green_bullet \e[1m${aDESCRIPTION[1]} \e[90m| $(uptime -p 2>&1)\e[0m"									#1: Uptime
-		(( ${aENABLED[2]} == 1 )) && echo -e "$green_bullet \e[1m${aDESCRIPTION[2]} \e[90m| $(print_full_info=1 G_OBTAIN_CPU_TEMP 2>&1)\e[0m"						#2: CPU temp
-		(( ${aENABLED[3]} == 1 )) && echo -e "$green_bullet \e[1m${aDESCRIPTION[3]} \e[90m| $(hostname -f 2>&1)\e[0m"									#3: Hostname
-		(( ${aENABLED[4]} == 1 )) && echo -e "$green_bullet \e[1m${aDESCRIPTION[4]} \e[90m| $(hostname -y 2>&1)\e[0m"									#4: Domain name
-		(( ${aENABLED[5]} == 1 )) && echo -e "$green_bullet \e[1m${aDESCRIPTION[5]} \e[90m| $(mawk 'NR==3 {dev=$0} NR==4 {print $0" ("dev")"}' /DietPi/dietpi/.network 2>&1)\e[0m"	#5: LAN IP (adapter)
-		(( ${aENABLED[6]} == 1 )) && echo -e "$green_bullet \e[1m${aDESCRIPTION[6]} \e[90m| $(curl -sLm 2 https://dietpi.com/myip.php 2>&1)\e[0m"					#6: WAN IP # Move this to /DietPi/dietpi/.network?
-		(( ${aENABLED[7]} == 1 )) && echo -e "$green_bullet \e[1m${aDESCRIPTION[7]} \e[90m| $(df -h --output=avail / | mawk 'NR==2 {print $1}' 2>&1)\e[0m"				#7: Freespace (RootFS)
-		(( ${aENABLED[8]} == 1 )) && echo -e "$green_bullet \e[1m${aDESCRIPTION[8]} \e[90m| $(df -h --output=avail /mnt/dietpi_userdata | mawk 'NR==2 {print $1}' 2>&1)\e[0m"		#8: Freespace (DietPi userdata)
-		(( ${aENABLED[9]} == 1 )) && echo -e "$green_bullet \e[1m${aDESCRIPTION[9]} \e[90m| $(curl -sLm 2 https://wttr.in/?format=4 2>&1)\e[0m"						#9: Weather
-		(( ${aENABLED[10]} == 1 )) && [[ -x $FP_CUSTOM ]] && echo -e "$green_bullet \e[1m${aDESCRIPTION[10]} \e[90m| $(bash $FP_CUSTOM 2>&1)\e[0m"						#10: Custom
+		(( ${aENABLED[0]} == 1 )) && echo -e "$GREEN_BULLET ${aCOLOUR[1]}${aDESCRIPTION[0]} $GREEN_SEPERATOR $(mawk 'NR==2 {print $0}' /DietPi/dietpi/.hw_model 2>&1)"				#0: Device model
+		(( ${aENABLED[1]} == 1 )) && echo -e "$GREEN_BULLET ${aCOLOUR[1]}${aDESCRIPTION[1]} $GREEN_SEPERATOR $(uptime -p 2>&1)"									#1: Uptime
+		(( ${aENABLED[2]} == 1 )) && echo -e "$GREEN_BULLET ${aCOLOUR[1]}${aDESCRIPTION[2]} $GREEN_SEPERATOR $(print_full_info=1 G_OBTAIN_CPU_TEMP 2>&1)"					#2: CPU temp
+		(( ${aENABLED[3]} == 1 )) && echo -e "$GREEN_BULLET ${aCOLOUR[1]}${aDESCRIPTION[3]} $GREEN_SEPERATOR $(hostname -f 2>&1)"								#3: Hostname
+		(( ${aENABLED[4]} == 1 )) && echo -e "$GREEN_BULLET ${aCOLOUR[1]}${aDESCRIPTION[4]} $GREEN_SEPERATOR $(hostname -y 2>&1)"								#4: Domain name
+		(( ${aENABLED[5]} == 1 )) && echo -e "$GREEN_BULLET ${aCOLOUR[1]}${aDESCRIPTION[5]} $GREEN_SEPERATOR $(mawk 'NR==3 {dev=$0} NR==4 {print $0" ("dev")"}' /DietPi/dietpi/.network 2>&1)"	#5: LAN IP (adapter)
+		(( ${aENABLED[6]} == 1 )) && echo -e "$GREEN_BULLET ${aCOLOUR[1]}${aDESCRIPTION[6]} $GREEN_SEPERATOR $(curl -sLm 2 https://dietpi.com/myip.php 2>&1)"					#6: WAN IP # Move this to /DietPi/dietpi/.network?
+		(( ${aENABLED[7]} == 1 )) && echo -e "$GREEN_BULLET ${aCOLOUR[1]}${aDESCRIPTION[7]} $GREEN_SEPERATOR $(df -h --output=avail / | mawk 'NR==2 {print $1}' 2>&1)"				#7: Freespace (RootFS)
+		(( ${aENABLED[8]} == 1 )) && echo -e "$GREEN_BULLET ${aCOLOUR[1]}${aDESCRIPTION[8]} $GREEN_SEPERATOR $(df -h --output=avail /mnt/dietpi_userdata | mawk 'NR==2 {print $1}' 2>&1)"	#8: Freespace (DietPi userdata)
+		(( ${aENABLED[9]} == 1 )) && echo -e "$GREEN_BULLET ${aCOLOUR[1]}${aDESCRIPTION[9]} $GREEN_SEPERATOR $(curl -sLm 2 https://wttr.in/?format=4 2>&1)"					#9: Weather
+		(( ${aENABLED[10]} == 1 )) && [[ -x $FP_CUSTOM ]] && echo -e "$GREEN_BULLET ${aCOLOUR[1]}${aDESCRIPTION[10]} $GREEN_SEPERATOR $(bash $FP_CUSTOM 2>&1)"					#10: Custom
 		echo -e "$GREEN_LINE\n"
 
 		Print_Credits
@@ -251,19 +268,19 @@ NB: It is executed as bash script, so it needs to be in bash compatible syntax.
 	#/////////////////////////////////////////////////////////////////////////////////////
 	# Main Loop
 	#/////////////////////////////////////////////////////////////////////////////////////
-
+	#-----------------------------------------------------------------------------------
+	Load
+	#-----------------------------------------------------------------------------------
 	if (( $INPUT == 0 )); then
 
 		Print_Header
 
 	elif (( $INPUT == 1 )); then
 
-		Load
 		Print_Banner
 
 	elif (( $INPUT == 2 )); then
 
-		Load
 		Menu_Main
 		Print_Banner
 

dietpi/patch_file

@@ -1659,11 +1659,12 @@ Redirect permanent /ocs-provider /nextcloud/ocs-provider' >> /etc/apache2/sites-
 			#-------------------------------------------------------------------------------
 			#Reinstalls
 			#	Amiberry 2.25: https://github.com/MichaIng/DietPi/issues/2599
+			#	Allo GUI v13: https://github.com/sparky-sbc/sparky-test/tree/master/dietpi-gui-usbdebug
 			#	Deluge: Patch according to installer rework: https://github.com/MichaIng/DietPi/pull/2594
 			#	rTorrent: https://github.com/MichaIng/DietPi/issues/2629
 			if (( $G_DIETPI_INSTALL_STAGE == 2 )); then
 
-				local reinstall_indices='108'
+				local reinstall_indices='108 160'
 
 				if grep -q '^aSOFTWARE_INSTALL_STATE\[107\]=2' /DietPi/dietpi/.installed &&
 					[[ -f /root/.rtorrent.rc ]]; then

dietpi/server_version-6

@@ -1,3 +1,3 @@
 6
 22
-2
+3