Drop deprecated shares_* subdirs, and introduce new group-accessible shared_* dirs.

1 files changed, 12 insertions, 14 deletions

diff --git a/user-init b/user-init
index 51b89e4..5bd97a9 100755
--- a/user-init
+++ b/user-init
@@ -238,6 +238,18 @@ for user in $USERS; do
 		fi
 	done
 
+	# Shared dirs are writable by own primary group
+	for dir in `cd "$HOME" && find . -mindepth 1 -maxdepth 1 -type d -regex '^\./shared\(_.*\)?'`; do
+		chgrp -R "$user" "$HOME/$dir"
+		chmod -R ug=rw,o=,ug+X,g+s "$HOME/$dir"
+		if [ -n "$NETATALK" ]; then
+			rm -rf "$HOME/$dir/Network Trash Folder"
+			mkdir "$HOME/$dir/Network Trash Folder"
+			chown nobody: "$HOME/$dir/Network Trash Folder"
+			chmod a= "$HOME/$dir/Network Trash Folder"
+		fi
+	done
+
 	# Private dirs are readable by own primary group
 	for dir in `cd "$HOME" && find . -mindepth 1 -maxdepth 1 -type d -regex '^\./private\(_.*\)?$'`; do
 		chown -R "$user": "$HOME/$dir"
@@ -350,20 +362,6 @@ for user in $USERS; do
 		done)
 	done)
 
-	# Deprecated share permissions
-	for dir in `cd "$HOME" && find . -mindepth 1 -maxdepth 1 -type d -regex '^\./shares_win.*'`; do
-		chgrp -R "$user" "$HOME/$dir"
-		chmod -R u=rw,g=rw,o=,ug+X,g+s "$HOME/$dir"
-	done
-	for dir in `cd "$HOME" && find . -mindepth 1 -maxdepth 1 -type d -regex '^\./shares_mac.*'`; do
-		chgrp -R "$user" "$HOME/$dir"
-		chmod -R u=rw,g=rw,o=,ug+X,g+s "$HOME/$dir"
-		rm -rf "$HOME/$dir/Network Trash Folder"
-		mkdir "$HOME/$dir/Network Trash Folder"
-		chown nobody: "$HOME/$dir/Network Trash Folder"
-		chmod a= "$HOME/$dir/Network Trash Folder"
-	done
-
 	# Ftp shares permissions
 	for dir in `cd "$HOME" && find . -mindepth 1 -maxdepth 1 -type d -regex "^\./ftp_$user$"`; do
 		chgrp -R "$user" "$HOME/$dir"