user-init: Add support for shares_win and shares_mac (and remove support for shares_<uid>).

1 files changed, 5 insertions, 9 deletions

diff --git a/user-init b/user-init
index fb8f55a..59cac74 100755
--- a/user-init
+++ b/user-init
@@ -161,18 +161,14 @@ for user in $USERS; do
 		fi
 	fi
 
-	# Mac shares permissions
-	for dir in `find $HOME -mindepth 1 -maxdepth 1 -type d | egrep "^$HOME/mac_$USER$"`; do
+	# Share permissions
+	for dir in `find $HOME -mindepth 1 -maxdepth 1 -type d | egrep "^$HOME/shares_win"`; do
 		chgrp -R $user $dir
 		chmod -R u=rw,g=rw,o=,ug+X,g+s $dir
-		rm -rf $dir/Network\ Trash\ Folder
-		mkdir $dir/Network\ Trash\ Folder
-		chown nobody: $dir/Network\ Trash\ Folder
-		chmod a= $dir/Network\ Trash\ Folder
 	done
-	for dir in `find $HOME -mindepth 1 -maxdepth 1 -type d | egrep "^$HOME/mac_${USER}_ro$"`; do
-		chown -R $user: $dir
-		chmod -R u=rw,g=r,o=,ug+X $dir
+	for dir in `find $HOME -mindepth 1 -maxdepth 1 -type d | egrep "^$HOME/shares_mac"`; do
+		chgrp -R $user $dir
+		chmod -R u=rw,g=rw,o=,ug+X,g+s $dir
 		rm -rf $dir/Network\ Trash\ Folder
 		mkdir $dir/Network\ Trash\ Folder
 		chown nobody: $dir/Network\ Trash\ Folder