Merge branch 'master' into development

.github/FUNDING.yml

+custom: https://www.armbian.com/donate

debian-config-jobs

@@ -1019,6 +1019,14 @@ function jobs ()
 		fi
 	;;
 
+        "Gimp" )
+                if ! check_if_installed gimp then ; then
+                        debconf-apt-progress -- apt-get -y install gimp
+                else
+                        debconf-apt-progress -- apt-get -y purge gimp
+                fi
+        ;;
+
 	"Libre" )
 		debconf-apt-progress -- apt-get -y purge libreoffice*
 	;;
@@ -1067,6 +1075,20 @@ function jobs ()
 		fi
 	;;
 
+	"Avahi")
+	if ! is_package_manager_running; then
+		if check_if_installed avahi-daemon ; then
+			service avahi-daemon stop
+			debconf-apt-progress -- apt-get -y purge avahi-daemon
+		else
+			debconf-apt-progress -- apt-get -y install avahi-daemon
+			[[ -f /usr/share/doc/avahi-daemon/examples/sftp-ssh.service ]] && cp /usr/share/doc/avahi-daemon/examples/sftp-ssh.service /etc/avahi/services/
+			[[ -f /usr/share/doc/avahi-daemon/examples/ssh.service ]] && cp /usr/share/doc/avahi-daemon/examples/ssh.service /etc/avahi/services/
+			service avahi-daemon restart
+		fi
+	fi
+	;;
+
 
 	# Edit boot environment
 	#
@@ -1157,9 +1179,9 @@ function jobs ()
 		PREFIX="$(echo $BEFORE | cut -f1 -d".")"
 		AVAL_MIRROR=()
 		if [[ $PREFIX == beta ]]; then
-			AVAL_MIRROR=("beta.armbian.com" "mirrors.netix.net/armbian/apt/")
+			AVAL_MIRROR=("beta.armbian.com")
 			else
-			AVAL_MIRROR+=("apt.armbian.com" "mirrors.tuna.tsinghua.edu.cn/armbian/" "mirrors.netix.net/armbian/apt/" "mirrors.dotsrc.org/armbian-apt/")
+			AVAL_MIRROR+=("apt.armbian.com" "mirrors.tuna.tsinghua.edu.cn/armbian/" "mirrors.dotsrc.org/armbian-apt/")
 		fi
 		local LIST=()
 		for i in "${AVAL_MIRROR[@]}"

debian-config-submenu

@@ -63,6 +63,13 @@ while true; do
 		LIST+=( "CPU" "Set CPU speed and governor" )
 	fi
 
+	AVAHIDSTATUS=$(service avahi-daemon status 2> /dev/null | grep -w active | grep -w running)
+	if [[ -n "$AVAHIDSTATUS" ]]; then
+		LIST+=( "Avahi" "Disable system announce in the network" )
+		else
+		LIST+=( "Avahi" "Announce system in the network" )
+	fi
+
 	[[ -d ${OVERLAYDIR} ]] && \
 	LIST+=( "Hardware" "Toggle hardware configuration: UART, I2C, etc." )
 	[[ "$LINUXFAMILY" = cubox && "$BRANCH" = "next" ]] && LIST+=( "DTB" "Switch board .dtb configuration" )
@@ -386,6 +393,11 @@ while true; do
 				else
 				LIST+=( "Thunderbird" "Remove full featured email client" )
 			fi
+                        if ! check_if_installed gimp ; then
+                                LIST+=( "Gimp" "Install photo manipulation tool" )
+                                else
+                                LIST+=( "Gimp" "Remove photo manipulation tool" )
+                        fi
 			if ! check_if_installed libreoffice-writer ; then
 				LIST+=( "Writer" "Libreoffice: Writer only" )
 				LIST+=( "Suite" "Libreoffice: Full suite" )

debian-software

@@ -526,7 +526,9 @@ fi
 
 
 install_ncp (){
-    curl -sSL https://raw.githubusercontent.com/nextcloud/nextcloudpi/master/install.sh | bash
+	curl -sSL https://raw.githubusercontent.com/nextcloud/nextcloudpi/master/install.sh > ${TEMP_DIR}/install.sh
+	sed 's/grep -q -e .*/[[ \$(lsb_release -is) != "Debian" ]] \&\& \{/' -i ${TEMP_DIR}/install.sh
+	bash ${TEMP_DIR}/install.sh
 }
 
 
@@ -555,6 +557,7 @@ case $distribution in
 		OMV_EXTRA_PACKAGES="openmediavault-flashmemory openmediavault-netatalk"
 		;;
 	buster)
+		dialog --title "Warning" --msgbox "\nPlease be aware that OMV5 is still in beta state, might be functionally broken or not working at all. Report any issues you run into at forum.openmediavault.org.\n\nIf you want to run OMV4 remain on Debian Stretch" 11 56
 		OMV_Name="usul"
 		OMV_EXTRAS_URL="https://github.com/OpenMediaVault-Plugin-Developers/packages/raw/master/openmediavault-omvextrasorg_latest_all5.deb"
 		OMV_EXTRA_PACKAGES="openmediavault-flashmemory"