v158

+ DietPi-Config | NAS: Resolved an issue where samba client share names,
which contained spaces, would cause the mount the fail:
https://github.com/Fourdee/DietPi/issues/1201

CHANGELOG.txt

@@ -6,6 +6,7 @@ DietPi-Software | Gitea: Now available for installation. Many thanks to @techdab
 DietPi-Software | Squeezelite recompiled with -DDSD, now supports DSD and DoP audio playback: https://github.com/Fourdee/DietPi/issues/1210
 
 Bug Fixes:
+DietPi-Config | NAS: Resolved an issue where samba client share names, which contained spaces, would cause the mount the fail: https://github.com/Fourdee/DietPi/issues/1201
 DietPi-Set_Hardware | Soundcard: When setting USB-DAC, and it fails detection, the soundcard will be reset to 'none'.
 
 Allo Web Interface Changes:

dietpi/dietpi-config

@@ -4754,9 +4754,9 @@ _EOF_
 			if (( $(df -h | grep -ci -m1 '/mnt/samba') == 1 )); then
 
 				#Get stats
-				sambaclient_mounted_size=$(df -h | grep -m1 '/mnt/samba' | awk '{ print $2 }')
-				sambaclient_mounted_used=$(df -h | grep -m1 '/mnt/samba' | awk '{ print $3 }')
-				sambaclient_mounted_free=$(df -h | grep -m1 '/mnt/samba' | awk '{ print $4 }')
+				sambaclient_mounted_size=$(df -h | grep -m1 '/mnt/samba' | awk '{print $(NF-4)}')
+				sambaclient_mounted_used=$(df -h | grep -m1 '/mnt/samba' | awk '{print $(NF-3)}')
+				sambaclient_mounted_free=$(df -h | grep -m1 '/mnt/samba' | awk '{print $(NF-2)}')
 				sambaclient_status="/mnt/samba | Size $sambaclient_mounted_size | Used $sambaclient_mounted_used | Free $sambaclient_mounted_free"
 
 			fi

dietpi/func/dietpi-set_smbclient

@@ -42,8 +42,11 @@
 
 	Apply_And_Mount(){
 
+		#NB: Convert spaces into '\040': https://github.com/Fourdee/DietPi/issues/1201#issuecomment-339720271
+		local space_to_040=$(echo -e "$samba_clientshare" | sed 's/ /\\\\040/g')
+
 		#Apply to fstab
-		sed -i "/\/mnt\/samba/c\\/\/$samba_clientname\/$samba_clientshare \/mnt\/samba cifs username=$samba_clientusename,password=$samba_clientpassword,iocharset=utf8,sec=ntlm,nofail  0  0" /etc/fstab
+		sed -i "/\/mnt\/samba/c\\/\/$samba_clientname\/$space_to_040 \/mnt\/samba cifs username=$samba_clientusename,password=$samba_clientpassword,iocharset=utf8,sec=ntlm,nofail  0  0" /etc/fstab
 
 		#Mount up
 		mount -a