v6.23

+ DietPi-Software | Tiny wording

dietpi/dietpi-software

@@ -15682,15 +15682,15 @@ This will allow you to choose which program loads automatically, after the syste
 
 					G_WHIP_MENU_ARRAY=(
 
-						'List' ': Select from a list of available drive mounts, to move user data.'
-						'Custom' ': Input a manual location to move user data.'
-						'Drive' ': Launches DietPi Drive Manager.'
+						'List' ': Select from a list of available drives to move user data.'
+						'Custom' ': Manually enter a location location to move user data.'
+						'Drive' ': Launch DietPi-Drive_Manager.'
 
 					)
 
 					G_WHIP_BUTTON_CANCEL_TEXT='Back'
-					G_WHIP_MENU 'Choose where to store your user data. User data includes software such as Owncloud data store, BitTorrent downloads etc.\n
-More information on user data in DietPi:\n- https://dietpi.com/phpbb/viewtopic.php?f=8&t=478&p=2087\n\n- DietPi-Drive Manager: Launch DietPi-Drive Manager to setup external drives, and, move user data to different locations.'
+					G_WHIP_MENU 'Choose where to store your user data. User data includes software such as ownCloud data store, BitTorrent downloads etc.\n
+More information on user data in DietPi:\n- https://dietpi.com/phpbb/viewtopic.php?p=2087\n\n- DietPi-Drive_Manager: Launch DietPi-Drive_Manager to setup external drives, and, move user data to different locations.'
 					if (( $? == 0 )); then
 
 						# - DriveMan
@@ -15738,7 +15738,7 @@ More information on user data in DietPi:\n- https://dietpi.com/phpbb/viewtopic.p
 
 								else
 
-									G_WHIP_MSG "User data transfer: Failed\n\n$(cat /var/log/dietpi-move_userdata.log)\n\nNo changes have been applied."
+									G_WHIP_MSG "User data transfer: Failed\n\n$(</var/log/dietpi-move_userdata.log)\n\nNo changes have been applied."
 
 								fi
 
@@ -15917,8 +15917,7 @@ When you select any software for install that requires a webserver, DietPi will
 			if G_WHIP_YESNO 'Do you wish to exit DietPi-Software?\n\nAll changes to software selections will be cleared.'; then
 
 				Banner_Aborted
-				# Exit script NOW
-				exit
+				exit 0
 
 			fi
 
@@ -15980,18 +15979,16 @@ Software details, usernames, passwords etc:\n - https://dietpi.com/software\n\nW
 NB: You can use dietpi-software at a later date, to install optimised software from our catalogue as required.\n\nDo you wish to continue with DietPi as a pure minimal image?'
 				if (( $? == 0 )); then
 
-					#exit menu system
-					TARGETMENUID=-1
+					TARGETMENUID=-1 # Exit menu
 
 					DISABLE_REBOOT=1
 
-					#Enable installation start flag
+					# Enable installation start flag
 					GOSTARTINSTALL=1
 
 				else
 
-					#Return to Main Menu
-					TARGETMENUID=0
+					TARGETMENUID=0 # Main menu
 
 				fi
 
@@ -16012,7 +16009,7 @@ NB: You can use dietpi-software at a later date, to install optimised software f
 		# Generate Whiptail menu and store results into our software arrays
 		Menu_CreateSoftwareList 0
 
-		TARGETMENUID=0 # Return to Main Menu
+		TARGETMENUID=0 # Main menu
 
 	}
 
@@ -16022,7 +16019,7 @@ NB: You can use dietpi-software at a later date, to install optimised software f
 		# Generate Whiptail menu and store results into our software arrays
 		Menu_CreateSoftwareList 1
 
-		TARGETMENUID=0 # Return to Main Menu
+		TARGETMENUID=0 # Main menu
 
 	}