v6.17

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,7 +8,7 @@ about: Create a report to help us improve
 
 
 #### Required Information:
-- DietPi version	| `paste -sd '.' /DietPi/dietpi/.version`
+- DietPi version	| `cat /DietPi/dietpi/.version`
 - Distro version	| `echo $G_DISTRO_NAME` or `cat /etc/debian_version`
 - Kernel version	| `uname -a`
 - SBC device		| `echo $G_HW_MODEL_DESCRIPTION` or (EG: RPi3)

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
 <!--
 Before submitting a pull request
-- Please ensure target branch is the testing (active dev) branch: https://github.com/Fourdee/DietPi/tree/testing
+- Please ensure the target branch is the testing (active dev) branch: https://github.com/Fourdee/DietPi/tree/testing
 - Please ensure changes have been tested and verified functional.
 -->
 **Status**: WIP | Testing | Ready | ?

.meta/dietpi-cloud-migration

@@ -10,39 +10,39 @@ echo -e '[\e[32m  OK  \e[0m] Successfully installed rsync.'
 run_backup(){
 
 	echo '[ INFO ] Enabling maintenance mode...'
-	sudo -u www-data php /var/www/"$1"/occ maintenance:mode --on
+	sudo -u www-data php /var/www/$1/occ maintenance:mode --on
 	(( $? )) && echo -e '[\e[31mFAILED\e[0m] Could not enable maintenance mode, please check running state of your instance and PHP functionality.\n' && exit 1
 
 	fp_config="/var/www/$1/config/config.php"
 
 	echo "[ INFO ] Scanning $fp_config for necessary information..."
-	[ ! -f $fp_config ] && echo -e "[\e[31mFAILED\e[0m] File $fp_config not found, please check your installation.\n" && exit 1
-
-	fp_datadir=$(grep -m1 "^[[:blank:]]*'datadirectory'" $fp_config | awk '{print $3}' | sed "s/[',]//g")
-	echo -e "\t- data directory:\t$fp_datadir"
-	dbname=$(grep -m1 "^[[:blank:]]*'dbname'" $fp_config | awk '{print $3}' | sed "s/[',]//g")
-	echo -e "\t- database name:\t$dbname"
-	dbhost=$(grep -m1 "^[[:blank:]]*'dbhost'" $fp_config | awk '{print $3}' | sed "s/[',]//g")
-	echo -e "\t- database hostname:\t$dbhost"
-	dbuser=$(grep -m1 "^[[:blank:]]*'dbuser'" $fp_config | awk '{print $3}' | sed "s/[',]//g")
-	echo -e "\t- database username:\t$dbuser"
-	dbpass=$(grep -m1 "^[[:blank:]]*'dbpassword'" $fp_config | awk '{print $3}' | sed "s/[',]//g")
-	echo -e "\t- database password:\t$dbpass"
+	[[ ! -f $fp_config ]] && echo -e "[\e[31mFAILED\e[0m] File $fp_config not found, please check your installation.\n" && exit 1
+
+	local fp_datadir=$(grep -m1 "^[[:blank:]]*'datadirectory'" $fp_config | awk '{print $3}' | sed "s/[',]//g")
+	local dbname=$(grep -m1 "^[[:blank:]]*'dbname'" $fp_config | awk '{print $3}' | sed "s/[',]//g")
+	local dbhost=$(grep -m1 "^[[:blank:]]*'dbhost'" $fp_config | awk '{print $3}' | sed "s/[',]//g")
+	local dbuser=$(grep -m1 "^[[:blank:]]*'dbuser'" $fp_config | awk '{print $3}' | sed "s/[',]//g")
+	local dbpass=$(grep -m1 "^[[:blank:]]*'dbpassword'" $fp_config | awk '{print $3}' | sed "s/[',]//g")
+	echo -e " - data directory:	$fp_datadir
+ - database name:	$dbname
+ - database hostname:	$dbhost
+ - database username:	$dbuser
+ - database password:	$dbpass"
 
 	echo '[ INFO ] Backup database to data directory...'
-	mysqldump -u"$dbuser" -h"$dbhost" -p"$dbpass" --lock-tables "$dbname" > "$fp_datadir"/dietpi-"$1"-database-backup.sql
+	mysqldump -u"$dbuser" -h"$dbhost" -p"$dbpass" "$dbname" > "$fp_datadir"/dietpi-$1-database-backup.sql
 	(( $? )) && echo -e '[\e[31mFAILED\e[0m] Database backup seems to have failed. Check state of your database server, check logs and in case repair table corruptions.\n' && exit 1
 	echo -e "[\e[32m  OK  \e[0m] Successfully finished database backup to: $fp_datadir/dietpi-$1-database-backup.sql"
 
 	echo '[ INFO ] Backup installation folder to data directory...'
-	rsync -aHp --delete /var/www/"$1"/ "$fp_datadir"/dietpi-"$1"-installation-backup
+	rsync -aHp --delete /var/www/$1/ "$fp_datadir"/dietpi-$1-installation-backup
 	(( $? )) && echo -e '[\e[31mFAILED\e[0m] Rsync failed, check for error reasons and try again.\n' && exit 1
 	echo -e "[\e[32m  OK  \e[0m] Successfully finished installation backup to: $fp_datadir/dietpi-$1-installation-backup/"
 
-	if [ -n "$2" ]; then
+	if [[ $2 ]]; then
 
 		echo '[ INFO ] You provided an additional backup location. Moving data directory...'
-		[ ! -d "$2" ] && echo -e "[\e[31mFAILED\e[0m] $2 is no directory, please check spelling and mount status of your desired backup location.\n" && exit 1
+		[[ ! -d $2 ]] && echo -e "[\e[31mFAILED\e[0m] $2 is no directory, please check spelling and mount status of your desired backup location.\n" && exit 1
 
 		rsync -aHp --delete "$fp_datadir"/ "$2"
 		(( $? )) && echo -e '[\e[31mFAILED\e[0m] Rsync failed, check for error reasons and try again.\n' && exit 1
@@ -60,7 +60,7 @@ run_backup(){
 
 ### MAIN ###
 
-[ ! -f /DietPi/dietpi/.installed ] && echo -e '[\e[31mFAILED\e[0m] No proper DietPi installation found or DietPi-RamDisk is not running. Please ensure you are executing this script from a functional DietPi system and "dietpi-ramdisk" is up.\n' && exit 1
+[[ ! -f /DietPi/dietpi/.installed ]] && echo -e '[\e[31mFAILED\e[0m] No proper DietPi installation found or DietPi-RamDisk is not running. Please ensure you are executing this script from a functional DietPi system and "dietpi-ramdisk" is up.\n' && exit 1
 
 if grep -q 'aSOFTWARE_INSTALL_STATE\[47\]=2' /DietPi/dietpi/.installed; then
 
@@ -76,4 +76,4 @@ if grep -q 'aSOFTWARE_INSTALL_STATE\[114\]=2' /DietPi/dietpi/.installed; then
 
 fi
 
-[ ! -n "$fp_config" ] && echo -e "[\e[31mFAILED\e[0m] No ownCloud or Nextcloud installation found. Please verify that it was installed via dietpi-software, in case reinstall it, non of your existing data/settings will be overwritten.\n" && exit 1
+[[ ! $fp_config ]] && echo -e "[\e[31mFAILED\e[0m] No ownCloud or Nextcloud installation found. Please verify that it was installed via dietpi-software, in case reinstall it, non of your existing data/settings will be overwritten.\n" && exit 1