[Tikiwiki-cvs] tiki fixperms.sh, 1.1.2.9, 1.1.2.10 setup.sh, 1.28.2.18, 1.28.2.19

[<lph...@us...>]

Update of /cvsroot/tikiwiki/tiki
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19790

Modified Files:
      Tag: BRANCH-1-9
	fixperms.sh setup.sh 
Log Message:
[MOD] Forcing use of 'sh setup.sh'


Index: fixperms.sh
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/fixperms.sh,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -d -r1.1.2.9 -r1.1.2.10
--- fixperms.sh	2 Dec 2007 23:25:54 -0000	1.1.2.9
+++ fixperms.sh	7 Feb 2008 21:45:02 -0000	1.1.2.10
@@ -1,4 +1,3 @@
-#!/bin/sh
 # $Header$
 
 # Copyright (c) 2002-2007, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
@@ -111,7 +110,6 @@
 	chown -R $AUSER:$AGROUP .
 	echo -n " chowned ..."
 	find . ! -regex '.*^\(devtools\).*' -type f -exec chmod 644 {} \;
-	chmod og+x setup.sh fixperms.sh
 	echo -n " files perms fixed ..."
 	find . -type d -exec chmod 755 {} \;
 	echo " dirs perms fixed ... done"
@@ -162,6 +160,5 @@
 	echo "Type 'fix' or 'open' as command argument."
 fi
 
-chmod +x $0
 exit 0
 

Index: setup.sh
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/setup.sh,v
retrieving revision 1.28.2.18
retrieving revision 1.28.2.19
diff -u -d -r1.28.2.18 -r1.28.2.19
--- setup.sh	8 Dec 2007 11:20:25 -0000	1.28.2.18
+++ setup.sh	7 Feb 2008 21:45:02 -0000	1.28.2.19
@@ -1,4 +1,3 @@
-#!/bin/sh
 # $Header$
 
 # Copyright (c) 2002-2007, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
@@ -51,19 +50,19 @@
 webserver writes files to. It also creates the (initially empty) cache 
 directories, if necessary.
 
-Usage $0 user [group] [rights] [list of virtual host domains]
+Usage sh $0 user [group] [rights] [list of virtual host domains]
 
 For example, if apache is running as user $AUSER and group $AGROUP (can be found in phpinfo),
  and if you are running as user $USER, type:
 
-  su -c '$0 $USER $AGROUP'
+  su -c 'sh $0 $USER $AGROUP'
  
 This will allow you to delete certain files/directories without becoming root.
   
 Or, if you can't become root, but are a member of the group apache runs under
 (for example: $AGROUP), you can type:
 
-  $0 $USER $AGROUP
+  sh $0 $USER $AGROUP
 
 Be aware, that you probably have to do a 
 
@@ -74,19 +73,19 @@
 If you can't become root, and are not a member of the apache group, but if
 your system uses ACL's (check with "mount | grep acl"), then type:
 
-  $0 -acl $USER $AGROUP
+  sh $0 -acl $USER $AGROUP
 
 If you can't become root, and are not a member of the apache group, and
 your system does not support ACL's then type:
 
-  $0 $USER yourgroup 02777
+  sh $0 $USER yourgroup 02777
 
 Replace yourgroup with your default group. Tip: You can find your group using the command 'id'.
 
 If you are on a shared hosting account, you can't become root, and your 
 group is probably the same as your user name. The following should work for you:
 
-  $0 $USER $USER 02777
+  sh $0 $USER $USER 02777
 
 
 NOTE: If you do execute one of the three last commands, you will not be able 
@@ -103,11 +102,11 @@
 add a list of domains to the command to create all the needed directories.
 For example:
 
-  su -c '$0 $USER $AGROUP $RIGHTS domain1 domain2 domain3'
+  su -c 'sh $0 $USER $AGROUP $RIGHTS domain1 domain2 domain3'
 
 or, if you can't become root:
 
-  $0 $USER $AGROUP 02777 domain1 domain2 domain3
+  sh $0 $USER $AGROUP 02777 domain1 domain2 domain3
 
 
 ---Mods----
@@ -116,12 +115,12 @@
 
 special for mods installer
 
-  $0 $AUSER all
+  sh $0 $AUSER all
 
 will change perms on all tiki files so you can use the tikimods power.
 Remember to run the perms setup again when mods installer use if done.
   
-	$0 $USER $AGROUP 
+	sh $0 $USER $AGROUP 
 
 EOF
 	exit 1
@@ -197,5 +196,7 @@
 # by setting the rights to tiki-install.php tiki-installer can be used in most cases to disable the file.
 chown $AUSER tiki-install.php
 
+sh fixperms.sh
+
 exit 0