[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[43888] branches/10.x/setup-revamp.sh

[<fm...@us...>]

Revision: 43888
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=43888&view=rev
Author:   fmg-sf
Date:     2012-11-10 22:04:11 +0000 (Sat, 10 Nov 2012)
Log Message:
-----------
[ENH] new setup script: set file permissions, model known from Tiki Permission Check (TPC)

Modified Paths:
--------------
    branches/10.x/setup-revamp.sh

Modified: branches/10.x/setup-revamp.sh
===================================================================
--- branches/10.x/setup-revamp.sh	2012-11-10 21:56:53 UTC (rev 43887)
+++ branches/10.x/setup-revamp.sh	2012-11-10 22:04:11 UTC (rev 43888)
@@ -157,6 +157,7 @@
 	echo CHGRP=${CHGRP}
 	echo CHMOD=${CHMOD}
 	echo CHOWN=${CHOWN}
+	echo FIND=${FIND}
 	echo ID=${ID}
 	echo MKDIR=${MKDIR}
 	echo MV=${MV}
@@ -170,6 +171,7 @@
 CHGRP=`which chgrp`
 CHMOD=`which chmod`
 CHOWN=`which chown`
+FIND=`which find`
 ID=`which id`
 MKDIR=`which mkdir`
 MV=`which mv`
@@ -178,11 +180,13 @@
 TOUCH=`which touch`
 UNIQ=`which uniq`
 if [ ${DEBUG} = '1' ] ; then
+	echo
 	echo after:
 	echo CAT=${CAT}
 	echo CHGRP=${CHGRP}
 	echo CHMOD=${CHMOD}
 	echo CHOWN=${CHOWN}
+	echo FIND=${FIND}
 	echo ID=${ID}
 	echo MKDIR=${MKDIR}
 	echo MV=${MV}
@@ -232,8 +236,25 @@
 # part 4 - several functions
 # --------------------------
 
-# part 4.1 - several permission settings for different usecases
+# part 4.1 - several functions as permission settings for different usecases
 
+debug_breakpoint() {
+	echo
+	echo "debug breakpoint"
+	exit 1
+
+}
+
+# debug exit
+debug_exit() {
+if [ ${DEBUG} = '1' ] ; then
+	echo
+	echo "Exiting... for execution mode use option '-d off' or set DEBUG=0 at the beginning of this script"
+	echo
+	exit 1
+fi
+}
+
 get_permission_data() {
 	if [ ${DEBUG} = '1' ] ; then
 		echo
@@ -278,39 +299,36 @@
 	fi
 }
 
-permission_default() {
-	${CHMOD} -fR u=rwX,go=rX .
-}
-
-permission_exceptions() {
-	${CHMOD} o-rwx db/local.php
-}
-
-permission_via_php_check() {
-	get_permission_data
- # set permissions here
- #echo "\nSTOP - DEBUG MODE"
- #exit 1
-	if [ ${DEBUG} = '2' ] ; then
+set_permission_data() {
+	if [ ${DEBUG} = '1' ] ; then
 		echo
-		find . -type d -exec echo ${CHMOD} ${MODEL_PERMS_SUBDIRS} {} \;
-		find . -type f -exec echo ${CHMOD} ${MODEL_PERMS_FILES} {} \;
+		echo ${FIND} . -type d -exec ${CHMOD} ${MODEL_PERMS_SUBDIRS} {} \;
+		echo ${FIND} . -type f -exec ${CHMOD} ${MODEL_PERMS_FILES} {} \;
 	fi
-	E=echo
-	$E find . -type d -exec ${CHMOD} ${MODEL_PERMS_SUBDIRS} {} \;
-	$E find . -type f -exec ${CHMOD} ${MODEL_PERMS_FILES} {} \;
- #echo
+	#debug_breakpoint
+	${FIND} . -type d -exec ${CHMOD} ${MODEL_PERMS_SUBDIRS} {} \;
+	${FIND} . -type f -exec ${CHMOD} ${MODEL_PERMS_FILES} {} \;
 	for WRITABLE in $DIRS ; do
- #echo ${WRITABLE}
 		if [ -d ${WRITABLE} ] ; then
-			$E find ${WRITABLE} -type d -exec echo ${CHMOD} ${MODEL_PERMS_WRITE_SUBDIRS} {} \;
-			$E find ${WRITABLE} -type f -exec echo ${CHMOD} ${MODEL_PERMS_WRITE_FILES} {} \;
+			if [ ${DEBUG} = '1' ] ; then
+				echo
+				echo ${FIND} ${WRITABLE} -type d -exec echo ${CHMOD} ${MODEL_PERMS_WRITE_SUBDIRS} {} \;
+				echo ${FIND} ${WRITABLE} -type f -exec echo ${CHMOD} ${MODEL_PERMS_WRITE_FILES} {} \;
+			fi
+			${FIND} ${WRITABLE} -type d -exec echo ${CHMOD} ${MODEL_PERMS_WRITE_SUBDIRS} {} \;
+			${FIND} ${WRITABLE} -type f -exec echo ${CHMOD} ${MODEL_PERMS_WRITE_FILES} {} \;
 		fi
 	done
- #echo "\nSTOP - DEBUG MODE"
- #exit 1
 }
 
+yet_unused_permission_default() {
+	${CHMOD} -fR u=rwX,go=rX .
+}
+
+yet_unused_permission_exceptions() {
+	${CHMOD} o-rwx db/local.php
+}
+
 # part 4.2 - several command options as fix, open, ...
 
 command_fix() {
@@ -461,14 +479,16 @@
 	echo " done"
 }
 
-# debug exit
-debug_exit() {
-if [ ${DEBUG} = '1' ] ; then
-	echo
-	echo "Exiting... for execution mode use option '-d off' or set DEBUG=0 at the beginning of this script"
-	echo
-	exit 1
-fi
+permission_via_php_check() {
+	# model was chosen by Tiki Permission Check (TPC)
+	get_permission_data
+	# set permissions
+#	if [ ${DEBUG} = '2' ] ; then
+#		echo
+#		${FIND} . -type d -exec echo ${CHMOD} ${MODEL_PERMS_SUBDIRS} {} \;
+#		${FIND} . -type f -exec echo ${CHMOD} ${MODEL_PERMS_FILES} {} \;
+#	fi
+	set_permission_data
 }
 
 # part 5 - main program
@@ -491,7 +511,7 @@
 	risky)		permission_via_php_check ;;
 	worry)		permission_via_php_check ;;
 	foo) echo foo ;;
-	*)		echo ${HINT_FOR_USER} ;;
+	*)		echo -e ${HINT_FOR_USER} ;;
 esac
 
 exit 0

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.