From 070810b7973629061be65b6bd1d57948df85b5cb Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 23 Oct 2010 19:50:01 +0200 Subject: [PATCH] netmount: add support for whitespaces in shares and folders, thanks much to Wintemrute Signed-off-by: Stephan Raue --- packages/network/netmount/config/netmount.conf.sample | 7 +++---- packages/network/netmount/init.network/43_netmount | 9 +++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/network/netmount/config/netmount.conf.sample b/packages/network/netmount/config/netmount.conf.sample index 0aab618844..ed5f5fac2b 100644 --- a/packages/network/netmount/config/netmount.conf.sample +++ b/packages/network/netmount/config/netmount.conf.sample @@ -8,12 +8,11 @@ # service | share on server | local mountpoint | mount options # # - please use an "|" as delimiter -# - dont use spaces in sharenames, local mountpounts, usernames, passwords -# and options. +# - dont use spaces in usernames, passwords and options. # - local mountpoints can be only on /storage and /media (not recommended!). # - you can use any dir inside the XBMC home /storage/.xbmc/... for local # mountpoints if you need this for some reasons. # -# Example: +# Examples: # cifs | //192.168.1.44/videos | /storage/mount/videos | username=user,password=secret - +# cifs | //192.168.1.44/tv shows | /storage/mount/tvshows | username=user,password=secret diff --git a/packages/network/netmount/init.network/43_netmount b/packages/network/netmount/init.network/43_netmount index 460dd5d836..10c501b0fb 100755 --- a/packages/network/netmount/init.network/43_netmount +++ b/packages/network/netmount/init.network/43_netmount @@ -37,10 +37,11 @@ IFS=" " for i in `cat $NETMOUNT_USERCONF |grep -v "^#"`; do - SERVICE=`echo $i | sed -e "s@ @@g" | cut -f1 -d "|"` - SHARE=`echo $i | sed -e "s@ @@g" | cut -f2 -d "|"` - MOUNTPOINT=`echo $i | sed -e "s@ @@g" | cut -f3 -d "|"` - OPTIONS=`echo $i | sed -e "s@ @@g" | cut -f4 -d "|"` + SERVICE=`echo $i | awk -F\| '{print $1}' | sed 's/^[ \t]*//;s/[ \t]*$//'` + SHARE=`echo $i | awk -F\| '{print $2}' | sed 's/^[ \t]*//;s/[ \t]*$//'` + MOUNTPOINT=`echo $i | awk -F\| '{print $3}' | sed 's/^[ \t]*//;s/[ \t]*$//'` + OPTIONS=`echo $i | awk -F\| '{print $4}' | sed 's/^[ \t]*//;s/[ \t]*$//'` + progress "... mounting $SHARE to $MOUNTPOINT ..."