[patch] Updated webapp-config-bsd.patch

webapp-config-bsd.patch (text/plain), 1.17 KB, created by Diego Elio Pettenò (RETIRED) on 2005-10-12 09:31:12 UTC

--- /usr/sbin/webapp-config	2005-08-03 17:09:15.000000000 +0200
+++ webapp-config	2005-08-17 15:10:38.000000000 +0200
@@ -69,6 +69,10 @@ fn_source "$MY_ETCCONFIG"
 # These are just basic data that is used by the three main operations -
 # install, upgrade, and clean.
 
+function root-group () {
+	echo -n $(groups root | egrep -o 'root|wheel' | sort | head -n 1)
+}
+
 G_MYNAME="$0"
 G_INSTALLDIR="/"
 G_ORIG_INSTALLDIR="/"
@@ -79,7 +83,7 @@ G_PN=
 G_PVR=
 G_HOSTNAME="${VHOST_HOSTNAME:-localhost}"
 G_CONFIG_UID="${VHOST_CONFIG_UID:-root}"
-G_CONFIG_GID="${VHOST_CONFIG_GID:-root}"
+G_CONFIG_GID="${VHOST_CONFIG_GID:-$(root-group)}"
 G_VIRTUAL_DIRS="${VHOST_CONFIG_VIRTUAL_DIRS:-virtual}"
 G_VIRTUAL_FILES="${VHOST_CONFIG_VIRTUAL_FILES:-virtual}"
 G_FORCE_VIRTUAL=0
@@ -2032,8 +2032,15 @@
 
 			# inherit the original permissions off the original
 			# file
+			
+			# Check for GNU or BSD stat
+			if stat 2>&1 | grep coreutils; then
+				STAT="stat -c '%a'"
+			else
+				STAT="stat -f '%Lp'"
+			fi
 
-			my_perms="`stat -c '%a' \"$MY_APPDIR/$1/$2\"`"
+			my_perms="`${STAT} \"$MY_APPDIR/$1/$2\"`"
 			chmod "$my_perms" "$3/$my_file"
 
 			# make sure these files are never world-writable