From 494300f70d3f3769dcc9e4afcb4838e3b30c453e Mon Sep 17 00:00:00 2001
From: MichaIng <28480705+MichaIng@users.noreply.github.com>
Date: Sat, 18 May 2019 21:11:26 +0200
Subject: [PATCH 1/2] META | Add v6.24 and v6.25 software arrays

---
 .meta/dietpi-survey_report | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.meta/dietpi-survey_report b/.meta/dietpi-survey_report
index 68a81f61cb..99cb9af8da 100644
--- a/.meta/dietpi-survey_report
+++ b/.meta/dietpi-survey_report
@@ -395,6 +395,17 @@
 	aSOFTWARE_NAME6_23[174]='GIMP'
 	aSOFTWARE_NAME6_23[175]='XFCE Power Manager'
 
+	# - v6.24 + v6.25
+	aSOFTWARE_NAME6_24=()
+	aSOFTWARE_NAME6_25=()
+	for i in ${!aSOFTWARE_NAME6_23[@]}
+	do
+
+		aSOFTWARE_NAME6_24[$i]=${aSOFTWARE_NAME6_23[$i]}
+		aSOFTWARE_NAME6_25[$i]=${aSOFTWARE_NAME6_24[$i]}
+
+	done
+
 	Main(){
 
 		# Copy files to RAM to speed up grep

From ea932cc83010a08d003d57b6685d2e33c648fa6f Mon Sep 17 00:00:00 2001
From: MichaIng <28480705+MichaIng@users.noreply.github.com>
Date: Sat, 18 May 2019 23:53:25 +0200
Subject: [PATCH 2/2] v6.24

+ DietPi-Globals | Fix G_SUDO command, since "&&" leads to input being called outside of sudo shell.
---
 dietpi/func/dietpi-globals | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dietpi/func/dietpi-globals b/dietpi/func/dietpi-globals
index 197d9af10f..6d837ea063 100644
--- a/dietpi/func/dietpi-globals
+++ b/dietpi/func/dietpi-globals
@@ -502,7 +502,7 @@ $(ps f -eo pid,user,tty,cmd | grep -i '[d]ietpi')"; then
 	#-----------------------------------------------------------------------------------
 	# DietPi scripts, moved from /etc/bash.bashrc
 	# - sudo command that ensures DietPi-Globals with G_* commands are loaded
-	G_SUDO(){ sudo -s . /DietPi/dietpi/func/dietpi-globals && "$@"; }
+	G_SUDO(){ local input=$@; sudo bash -c ". /DietPi/dietpi/func/dietpi-globals && $input"; }
 	# - sudo alias that allows running other aliases with "sudo"
 	alias sudo='sudo ' # https://github.com/MichaIng/DietPi/issues/424