From: <se...@us...> - 2008-07-31 14:07:31
|
Revision: 13979 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13979&view=rev Author: sept_7 Date: 2008-07-31 14:07:39 +0000 (Thu, 31 Jul 2008) Log Message: ----------- [ENH] speed up the setup script by avoiding double chmod -R on . Modified Paths: -------------- trunk/setup.sh Modified: trunk/setup.sh =================================================================== --- trunk/setup.sh 2008-07-31 13:56:26 UTC (rev 13978) +++ trunk/setup.sh 2008-07-31 14:07:39 UTC (rev 13979) @@ -110,8 +110,7 @@ # find . -type d -exec chmod 755 {} \; # echo " dirs perms fixed ... done" - chmod -R u=rwX . - chmod -R go=rX . + chmod -R u=rwX,go=rX . echo " done." This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ob...@us...> - 2008-11-05 23:36:20
|
Revision: 15534 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=15534&view=rev Author: obnoxxx Date: 2008-11-05 23:36:09 +0000 (Wed, 05 Nov 2008) Log Message: ----------- [MOD] setup.sh: make messages display nicely wrapped in 80 column terminals Modified Paths: -------------- trunk/setup.sh Modified: trunk/setup.sh =================================================================== --- trunk/setup.sh 2008-11-05 22:59:41 UTC (rev 15533) +++ trunk/setup.sh 2008-11-05 23:36:09 UTC (rev 15534) @@ -55,10 +55,11 @@ or -2- If you press enter to continue, you will probably get some error messages but it (the script) will -still fix what it can according to the permissions of your user. This script will now ask you some -questions. If you don't know what to answer, just press enter to each question (to use default value)" - +2- If you press enter to continue, you will probably get some error messages +but it (the script) will still fix what it can according to the permissions +of your user. This script will now ask you some questions. If you don't know +what to answer, just press enter to each question (to use default value)" + read AUSER=$USER fi @@ -141,9 +142,10 @@ or -2- If you press enter to continue, you will probably get some error messages but it (the script) will -still fix what it can according to the permissions of your user. This script will now ask you some -questions. If you don't know what to answer, just press enter to each question (to use default value)" +2- If you press enter to continue, you will probably get some error messages +but it (the script) will still fix what it can according to the permissions +of your user. This script will now ask you some questions. If you don't know +what to answer, just press enter to each question (to use default value)" read echo -n "Open global perms ..." This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2008-11-12 16:33:00
|
Revision: 15626 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=15626&view=rev Author: niclone Date: 2008-11-12 16:32:50 +0000 (Wed, 12 Nov 2008) Log Message: ----------- [FIX] better support for virtuals in setup script Modified Paths: -------------- trunk/setup.sh Modified: trunk/setup.sh =================================================================== --- trunk/setup.sh 2008-11-12 15:48:15 UTC (rev 15625) +++ trunk/setup.sh 2008-11-12 16:32:50 UTC (rev 15626) @@ -70,11 +70,13 @@ AGROUP=$REPLY fi - echo -n "Multi []: " + touch db/virtuals.inc + echo -n "Multi ["$(< db/virtuals.inc)"]: " read VIRTUALS + [ ! -n "$VIRTUALS" ] && VIRTUALS=$(< db/virtuals.inc) + if [ -n "$VIRTUALS" ]; then - touch db/virtuals.inc for vdir in $VIRTUALS; do echo $vdir >> db/virtuals.inc cat db/virtuals.inc | sort | uniq > db/virtuals.inc_new @@ -90,7 +92,7 @@ mkdir -p $dir fi echo " ok." - if [ -n $VIRTUALS ]; then + if [ -n "$VIRTUALS" ]; then for vdir in $VIRTUALS; do echo -n " $dir/$vdir ... " if [ ! -d "$dir/$vdir" ]; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2009-06-25 11:14:13
|
Revision: 19787 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=19787&view=rev Author: jonnybradley Date: 2009-06-25 11:14:11 +0000 (Thu, 25 Jun 2009) Log Message: ----------- [FIX] Setup script now picks correct user and group on Max OSX Modified Paths: -------------- trunk/setup.sh Modified: trunk/setup.sh =================================================================== --- trunk/setup.sh 2009-06-25 05:05:24 UTC (rev 19786) +++ trunk/setup.sh 2009-06-25 11:14:11 UTC (rev 19787) @@ -32,6 +32,9 @@ if [ "$UNAME" = "CYGWIN" ]; then AUSER=SYSTEM AGROUP=SYSTEM + elif [ "$UNAME" = "Darwin" ]; then + AUSER=_www + AGROUP=_www fi fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2009-09-27 15:50:08
|
Revision: 21795 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=21795&view=rev Author: niclone Date: 2009-09-27 15:49:55 +0000 (Sun, 27 Sep 2009) Log Message: ----------- [FIX] setup.sh: added optional parameters to the setup script, so that we can launch it without interaction (script asking parameters). usefull if for exemple setup.sh is launched from an another script. Modified Paths: -------------- trunk/setup.sh Modified: trunk/setup.sh =================================================================== --- trunk/setup.sh 2009-09-27 14:54:49 UTC (rev 21794) +++ trunk/setup.sh 2009-09-27 15:49:55 UTC (rev 21795) @@ -34,6 +34,34 @@ fi fi +usage() { + cat <<EOF +usage: $0 [<switches>] open|fix +-h show help +-u user owner of files (default: $AUSER) +-g group group of files (default: $AGROUP) +-v virtuals list of virtuals (for multitiki, exemple: "www1 www2") +-n not interactive mode +EOF +} + +OPT_AUSER= +OPT_AGROUP= +OPT_VIRTUALS= +OPT_NOTINTERACTIVE= + +while getopts "hu:g:v:n" OPTION; do + case $OPTION in + h) usage ; exit 0 ;; + u) OPT_AUSER=$OPTARG ;; + g) OPT_AGROUP=$OPTARG ;; + v) OPT_VIRTUALS=$OPTARG ;; + n) OPT_NOTINTERACTIVE=1 ;; + ?) usage ; exit 1 ;; + esac +done +shift $(($OPTIND - 1)) + if [ -z $1 ]; then COMMAND=fix else @@ -42,13 +70,18 @@ if [ "$COMMAND" = 'fix' ]; then if [ "$USER" = 'root' ]; then - echo -n "User [$AUSER]: " - read REPLY - if [ -n "$REPLY" ]; then - AUSER=$REPLY + if [ -n "$OPT_AUSER" ]; then + AUSER=$OPT_AUSER + elif [ -z "$OPT_NOTINTERACTIVE" ]; then + echo -n "User [$AUSER]: " + read REPLY + if [ -n "$REPLY" ]; then + AUSER=$REPLY + fi fi else - echo "You are not root or you are on a shared hosting account. You can now: + if [ -z "$OPT_NOTINTERACTIVE" ]; then + echo "You are not root or you are on a shared hosting account. You can now: 1- ctrl-c to break now. @@ -58,23 +91,33 @@ but it (the script) will still fix what it can according to the permissions of your user. This script will now ask you some questions. If you don't know what to answer, just press enter to each question (to use default value)" - - read WAIT - AUSER=$USER + + read WAIT + AUSER=$USER + fi fi - echo -n "Group [$AGROUP]: " - read REPLY - if [ -n "$REPLY" ]; then - AGROUP=$REPLY + if [ -n "$OPT_AGROUP" ]; then + AGROUP=$OPT_AGROUP + elif [ -z "$OPT_NOTINTERACTIVE" ]; then + echo -n "Group [$AGROUP]: " + read REPLY + if [ -n "$REPLY" ]; then + AGROUP=$REPLY + fi fi touch db/virtuals.inc - echo -n "Multi ["$(< db/virtuals.inc)"]: " - read VIRTUALS + if [ -n "$OPT_VIRTUALS" ]; then + VIRTUALS=$OPT_VIRTUALS + elif [ -n "$OPT_NOTINTERACTIVE" ]; then + VIRTUALS=$(cat db/virtuals.inc) + else + echo -n "Multi ["$(cat db/virtuals.inc)"]: " + read VIRTUALS + [ -z "$VIRTUALS" ] && VIRTUALS=$(cat db/virtuals.inc) + fi - [ ! -n "$VIRTUALS" ] && VIRTUALS=$(< db/virtuals.inc) - if [ -n "$VIRTUALS" ]; then for vdir in $VIRTUALS; do echo $vdir >> db/virtuals.inc @@ -128,33 +171,22 @@ elif [ "$COMMAND" = 'open' ]; then if [ "$USER" = 'root' ]; then - echo -n "User [$AUSER]: " - read REPLY - if [ -n "$REPLY" ]; then - AUSER=$REPLY - fi - echo -n "Open global perms ..." + if [ -n "$OPT_AUSER" ]; then + AUSER=$OPT_AUSER + elif [ -z "$OPT_NOTINTERACTIVE" ]; then + echo -n "User [$AUSER]: " + read REPLY + if [ -n "$REPLY" ]; then + AUSER=$REPLY + fi + fi chown -R $AUSER . - echo " done" else - echo "You are not root or you are on a shared hosting account. You can now: + echo "You are not root or you are on a shared hosting account. We will not try to change the file owners." + fi -1- ctrl-c to break now. - -or - -2- If you press enter to continue, you will probably get some error messages -but it (the script) will still fix what it can according to the permissions -of your user. This script will now ask you some questions. If you don't know -what to answer, just press enter to each question (to use default value)" - - read WAIT - echo -n "Open global perms ..." -# find . -type d -exec chmod 777 {} \; -# find . -type f -exec chmod 666 {} \; - chmod -R a=rwX . - echo " done" - fi + chmod -R a=rwX . + echo " done" else echo "Type 'fix' or 'open' as command argument." fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Marc L. <ma...@ma...> - 2009-09-27 16:02:38
|
Hi Niclone! For mass deployments, unattended backups & upgrades, etc. please look into the: Tiki Remote Instance Manager http://doc.tikiwiki.org/TRIM Best regards, M ;-) On Sun, Sep 27, 2009 at 11:49 AM, <ni...@us...> wrote: > Revision: 21795 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=21795&view=rev > Author: niclone > Date: 2009-09-27 15:49:55 +0000 (Sun, 27 Sep 2009) > > Log Message: > ----------- > [FIX] setup.sh: added optional parameters to the setup script, so that we can launch it without interaction (script asking parameters). usefull if for exemple setup.sh is launched from an another script. > > Modified Paths: > -------------- > trunk/setup.sh > > Modified: trunk/setup.sh > =================================================================== > --- trunk/setup.sh 2009-09-27 14:54:49 UTC (rev 21794) > +++ trunk/setup.sh 2009-09-27 15:49:55 UTC (rev 21795) > @@ -34,6 +34,34 @@ > fi > fi > > +usage() { > + cat <<EOF > +usage: $0 [<switches>] open|fix > +-h show help > +-u user owner of files (default: $AUSER) > +-g group group of files (default: $AGROUP) > +-v virtuals list of virtuals (for multitiki, exemple: "www1 www2") > +-n not interactive mode > +EOF > +} > + > +OPT_AUSER= > +OPT_AGROUP= > +OPT_VIRTUALS= > +OPT_NOTINTERACTIVE= > + > +while getopts "hu:g:v:n" OPTION; do > + case $OPTION in > + h) usage ; exit 0 ;; > + u) OPT_AUSER=$OPTARG ;; > + g) OPT_AGROUP=$OPTARG ;; > + v) OPT_VIRTUALS=$OPTARG ;; > + n) OPT_NOTINTERACTIVE=1 ;; > + ?) usage ; exit 1 ;; > + esac > +done > +shift $(($OPTIND - 1)) > + > if [ -z $1 ]; then > COMMAND=fix > else > @@ -42,13 +70,18 @@ > > if [ "$COMMAND" = 'fix' ]; then > if [ "$USER" = 'root' ]; then > - echo -n "User [$AUSER]: " > - read REPLY > - if [ -n "$REPLY" ]; then > - AUSER=$REPLY > + if [ -n "$OPT_AUSER" ]; then > + AUSER=$OPT_AUSER > + elif [ -z "$OPT_NOTINTERACTIVE" ]; then > + echo -n "User [$AUSER]: " > + read REPLY > + if [ -n "$REPLY" ]; then > + AUSER=$REPLY > + fi > fi > else > - echo "You are not root or you are on a shared hosting account. You can now: > + if [ -z "$OPT_NOTINTERACTIVE" ]; then > + echo "You are not root or you are on a shared hosting account. You can now: > > 1- ctrl-c to break now. > > @@ -58,23 +91,33 @@ > but it (the script) will still fix what it can according to the permissions > of your user. This script will now ask you some questions. If you don't know > what to answer, just press enter to each question (to use default value)" > - > - read WAIT > - AUSER=$USER > + > + read WAIT > + AUSER=$USER > + fi > fi > > - echo -n "Group [$AGROUP]: " > - read REPLY > - if [ -n "$REPLY" ]; then > - AGROUP=$REPLY > + if [ -n "$OPT_AGROUP" ]; then > + AGROUP=$OPT_AGROUP > + elif [ -z "$OPT_NOTINTERACTIVE" ]; then > + echo -n "Group [$AGROUP]: " > + read REPLY > + if [ -n "$REPLY" ]; then > + AGROUP=$REPLY > + fi > fi > > touch db/virtuals.inc > - echo -n "Multi ["$(< db/virtuals.inc)"]: " > - read VIRTUALS > + if [ -n "$OPT_VIRTUALS" ]; then > + VIRTUALS=$OPT_VIRTUALS > + elif [ -n "$OPT_NOTINTERACTIVE" ]; then > + VIRTUALS=$(cat db/virtuals.inc) > + else > + echo -n "Multi ["$(cat db/virtuals.inc)"]: " > + read VIRTUALS > + [ -z "$VIRTUALS" ] && VIRTUALS=$(cat db/virtuals.inc) > + fi > > - [ ! -n "$VIRTUALS" ] && VIRTUALS=$(< db/virtuals.inc) > - > if [ -n "$VIRTUALS" ]; then > for vdir in $VIRTUALS; do > echo $vdir >> db/virtuals.inc > @@ -128,33 +171,22 @@ > > elif [ "$COMMAND" = 'open' ]; then > if [ "$USER" = 'root' ]; then > - echo -n "User [$AUSER]: " > - read REPLY > - if [ -n "$REPLY" ]; then > - AUSER=$REPLY > - fi > - echo -n "Open global perms ..." > + if [ -n "$OPT_AUSER" ]; then > + AUSER=$OPT_AUSER > + elif [ -z "$OPT_NOTINTERACTIVE" ]; then > + echo -n "User [$AUSER]: " > + read REPLY > + if [ -n "$REPLY" ]; then > + AUSER=$REPLY > + fi > + fi > chown -R $AUSER . > - echo " done" > else > - echo "You are not root or you are on a shared hosting account. You can now: > + echo "You are not root or you are on a shared hosting account. We will not try to change the file owners." > + fi > > -1- ctrl-c to break now. > - > -or > - > -2- If you press enter to continue, you will probably get some error messages > -but it (the script) will still fix what it can according to the permissions > -of your user. This script will now ask you some questions. If you don't know > -what to answer, just press enter to each question (to use default value)" > - > - read WAIT > - echo -n "Open global perms ..." > -# find . -type d -exec chmod 777 {} \; > -# find . -type f -exec chmod 666 {} \; > - chmod -R a=rwX . > - echo " done" > - fi > + chmod -R a=rwX . > + echo " done" > else > echo "Type 'fix' or 'open' as command argument." > fi > > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > ------------------------------------------------------------------------------ > Come build with us! The BlackBerry® Developer Conference in SF, CA > is the only developer event you need to attend this year. Jumpstart your > developing skills, take BlackBerry mobile applications to market and stay > ahead of the curve. Join us from November 9-12, 2009. Register now! > http://p.sf.net/sfu/devconf > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > -- Marc Laporte http://MarcLaporte.com http://TikiWiki.org/MarcLaporte http://AvanTech.net http://OurWiki.net |
From: <jon...@us...> - 2010-03-29 09:40:55
|
Revision: 26361 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=26361&view=rev Author: jonnybradley Date: 2010-03-29 09:40:47 +0000 (Mon, 29 Mar 2010) Log Message: ----------- [MOD] Suppress the 10,000 or so errors generated when running the script not as root. Tiki seems to run fine afterwards so the errors seem to be superfluous. If ok this should be backported into 5.0 Modified Paths: -------------- trunk/setup.sh Modified: trunk/setup.sh =================================================================== --- trunk/setup.sh 2010-03-29 03:02:06 UTC (rev 26360) +++ trunk/setup.sh 2010-03-29 09:40:47 UTC (rev 26361) @@ -147,7 +147,7 @@ done echo -n "Fix global perms ..." - chown -R $AUSER:$AGROUP . + chown -fR $AUSER:$AGROUP . echo -n " chowned ..." # find . ! -regex '.*^\(devtools\).*' -type f -exec chmod 644 {} \; @@ -155,7 +155,7 @@ # find . -type d -exec chmod 755 {} \; # echo " dirs perms fixed ... done" - chmod -R u=rwX,go=rX . + chmod -fR u=rwX,go=rX . echo " done." @@ -163,7 +163,7 @@ if [ "$USER" = 'root' ]; then chmod -R g+w $DIRS else - chmod -R go+w $DIRS + chmod -fR go+w $DIRS fi # chmod 664 robots.txt tiki-install.php This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lph...@us...> - 2010-12-06 17:08:09
|
Revision: 31202 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31202&view=rev Author: lphuberdeau Date: 2010-12-06 17:08:02 +0000 (Mon, 06 Dec 2010) Log Message: ----------- [MOD] Rebuild index from setup.sh Modified Paths: -------------- trunk/setup.sh Modified: trunk/setup.sh =================================================================== --- trunk/setup.sh 2010-12-06 17:06:08 UTC (rev 31201) +++ trunk/setup.sh 2010-12-06 17:08:02 UTC (rev 31202) @@ -167,8 +167,14 @@ fi # chmod 664 robots.txt tiki-install.php + echo " done." + echo -n "Rebuilding search index..." + php -r "require_once 'tiki-setup.php'; require_once 'lib/search/searchlib-unified.php'; \$unifiedsearchlib->rebuild();" + chown -fR $AUSER:$AGROUP temp/unified-index/ + chmod -fR u=rwX,go=rwX temp/unified-index/ + echo " done." elif [ "$COMMAND" = 'open' ]; then if [ "$USER" = 'root' ]; then if [ -n "$OPT_AUSER" ]; then @@ -186,6 +192,7 @@ fi chmod -R a=rwX . + echo " done" else echo "Type 'fix' or 'open' as command argument." This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2012-10-02 19:16:40
|
Revision: 43251 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=43251&view=rev Author: marclaporte Date: 2012-10-02 19:16:31 +0000 (Tue, 02 Oct 2012) Log Message: ----------- Update dev docs about sh setup.sh Modified Paths: -------------- trunk/setup.sh Modified: trunk/setup.sh =================================================================== --- trunk/setup.sh 2012-10-02 18:17:23 UTC (rev 43250) +++ trunk/setup.sh 2012-10-02 19:16:31 UTC (rev 43251) @@ -4,8 +4,8 @@ # Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. # $Id$ -# This file is a replacement for setup.sh -# in test in 1.9 version +# This file sets permissions and creates relevant folders for Tiki. +# DIRS="db dump img/wiki img/wiki_up img/trackers modules/cache temp temp/cache temp/public templates_c templates styles maps whelp mods files tiki_tests/tests temp/unified-index" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cha...@us...> - 2013-02-21 10:20:20
|
Revision: 44937 http://sourceforge.net/p/tikiwiki/code/44937 Author: changi67 Date: 2013-02-21 10:20:18 +0000 (Thu, 21 Feb 2013) Log Message: ----------- [MOD] Add a NB for people who are behind a proxy server Modified Paths: -------------- trunk/setup.sh Modified: trunk/setup.sh =================================================================== --- trunk/setup.sh 2013-02-20 13:28:21 UTC (rev 44936) +++ trunk/setup.sh 2013-02-21 10:20:18 UTC (rev 44937) @@ -1,7 +1,7 @@ #! /bin/sh # (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project -# +# # All Rights Reserved. See copyright.txt for details and a complete list of authors. # Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. # $Id$ @@ -204,7 +204,7 @@ echo ${DEBUG_PREFIX} usage output: begin usage echo ${DEBUG_PREFIX} usage output: end - #echo ${DEBUG_PREFIX} + #echo ${DEBUG_PREFIX} fi # part 2 - distribution check @@ -499,7 +499,7 @@ fi fi -# find . ! -regex '.*^\(devtools\).*' -type f -exec chmod 644 {} \; +# find . ! -regex '.*^\(devtools\).*' -type f -exec chmod 644 {} \; # echo -n " files perms fixed ..." # find . -type d -exec chmod 755 {} \; # echo " dirs perms fixed ... done" @@ -762,7 +762,7 @@ There are some other commands recommended for advanced users only. More documentation about this: http://doc.tiki.org/Permission+Check - + EOF } @@ -828,7 +828,8 @@ if [ ! -f temp/composer.phar ]; then - echo We have failed to obtain the composer executable. + echo "We have failed to obtain the composer executable." + echo "NB: Maybe you are behing a proxy, just export https_proxy variable and relaunch setup.sh" echo "1) Download it from http://getcomposer.org" echo "2) Store it in temp/" exit This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lph...@us...> - 2013-08-17 16:18:31
|
Revision: 47123 http://sourceforge.net/p/tikiwiki/code/47123 Author: lphuberdeau Date: 2013-08-17 16:18:26 +0000 (Sat, 17 Aug 2013) Log Message: ----------- [MOD]?\194?\160Run composer only after permission changes, retry several times on failure Modified Paths: -------------- trunk/setup.sh Modified: trunk/setup.sh =================================================================== --- trunk/setup.sh 2013-08-17 15:00:00 UTC (rev 47122) +++ trunk/setup.sh 2013-08-17 16:18:26 UTC (rev 47123) @@ -803,43 +803,6 @@ done } -# Set-up and execute composer to obtain dependencies -exists() -{ - if type $1 &>/dev/null - then - return 0 - else - return 1 - fi -} - -if [ ! -f temp/composer.phar ]; -then - if exists curl; - then - curl -s https://getcomposer.org/installer | php -- --install-dir=temp - else - php -r "eval('?>'.file_get_contents('https://getcomposer.org/installer'));" -- --install-dir=temp - fi -else - php temp/composer.phar self-update -fi - -if [ ! -f temp/composer.phar ]; -then - echo "We have failed to obtain the composer executable." - echo "NB: Maybe you are behing a proxy, just export https_proxy variable and relaunch setup.sh" - echo "1) Download it from http://getcomposer.org" - echo "2) Store it in temp/" - exit -fi - -if exists php; -then - php temp/composer.phar install --prefer-dist -fi - # part 5 - main program # --------------------- @@ -891,6 +854,54 @@ *) hint_for_users ;; esac +# Set-up and execute composer to obtain dependencies +exists() +{ + if type $1 &>/dev/null + then + return 0 + else + return 1 + fi +} + +if [ ! -f temp/composer.phar ]; +then + if exists curl; + then + curl -s https://getcomposer.org/installer | php -- --install-dir=temp + else + php -r "eval('?>'.file_get_contents('https://getcomposer.org/installer'));" -- --install-dir=temp + fi +else + php temp/composer.phar self-update +fi + +if [ ! -f temp/composer.phar ]; +then + echo "We have failed to obtain the composer executable." + echo "NB: Maybe you are behing a proxy, just export https_proxy variable and relaunch setup.sh" + echo "1) Download it from http://getcomposer.org" + echo "2) Store it in temp/" + exit +fi + +N=0 +if exists php; +then + until php temp/composer.phar install --prefer-dist + do + if [ $N -eq 7 ]; + then + exit 2 + else + echo "Composer failed, retrying in 5 seconds, for a few times. Hit Ctrl-C to cancel." + sleep 5 + fi + ((N++)) + done +fi + exit 0 # EOF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nk...@us...> - 2013-08-18 00:35:40
|
Revision: 47125 http://sourceforge.net/p/tikiwiki/code/47125 Author: nkoth Date: 2013-08-18 00:35:36 +0000 (Sun, 18 Aug 2013) Log Message: ----------- [FIX] Composer not running after last change Modified Paths: -------------- trunk/setup.sh Modified: trunk/setup.sh =================================================================== --- trunk/setup.sh 2013-08-17 22:21:23 UTC (rev 47124) +++ trunk/setup.sh 2013-08-18 00:35:36 UTC (rev 47125) @@ -803,6 +803,54 @@ done } +# Set-up and execute composer to obtain dependencies +exists() +{ + if type $1 &>/dev/null + then + return 0 + else + return 1 + fi +} + +if [ ! -f temp/composer.phar ]; +then + if exists curl; + then + curl -s https://getcomposer.org/installer | php -- --install-dir=temp + else + php -r "eval('?>'.file_get_contents('https://getcomposer.org/installer'));" -- --install-dir=temp + fi +else + php temp/composer.phar self-update +fi + +if [ ! -f temp/composer.phar ]; +then + echo "We have failed to obtain the composer executable." + echo "NB: Maybe you are behing a proxy, just export https_proxy variable and relaunch setup.sh" + echo "1) Download it from http://getcomposer.org" + echo "2) Store it in temp/" + exit +fi + +N=0 +if exists php; +then + until php temp/composer.phar install --prefer-dist + do + if [ $N -eq 7 ]; + then + exit 2 + else + echo "Composer failed, retrying in 5 seconds, for a few times. Hit Ctrl-C to cancel." + sleep 5 + fi + ((N++)) + done +fi + # part 5 - main program # --------------------- @@ -854,54 +902,6 @@ *) hint_for_users ;; esac -# Set-up and execute composer to obtain dependencies -exists() -{ - if type $1 &>/dev/null - then - return 0 - else - return 1 - fi -} - -if [ ! -f temp/composer.phar ]; -then - if exists curl; - then - curl -s https://getcomposer.org/installer | php -- --install-dir=temp - else - php -r "eval('?>'.file_get_contents('https://getcomposer.org/installer'));" -- --install-dir=temp - fi -else - php temp/composer.phar self-update -fi - -if [ ! -f temp/composer.phar ]; -then - echo "We have failed to obtain the composer executable." - echo "NB: Maybe you are behing a proxy, just export https_proxy variable and relaunch setup.sh" - echo "1) Download it from http://getcomposer.org" - echo "2) Store it in temp/" - exit -fi - -N=0 -if exists php; -then - until php temp/composer.phar install --prefer-dist - do - if [ $N -eq 7 ]; - then - exit 2 - else - echo "Composer failed, retrying in 5 seconds, for a few times. Hit Ctrl-C to cancel." - sleep 5 - fi - ((N++)) - done -fi - exit 0 # EOF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nk...@us...> - 2013-08-18 00:58:59
|
Revision: 47126 http://sourceforge.net/p/tikiwiki/code/47126 Author: nkoth Date: 2013-08-18 00:58:55 +0000 (Sun, 18 Aug 2013) Log Message: ----------- [FIX] Allow fixing of perms before composer runs Modified Paths: -------------- trunk/setup.sh Modified: trunk/setup.sh =================================================================== --- trunk/setup.sh 2013-08-18 00:35:36 UTC (rev 47125) +++ trunk/setup.sh 2013-08-18 00:58:55 UTC (rev 47126) @@ -758,7 +758,7 @@ 7 pain 8 morepain 9 risky a insane - q quit x exit + q quit x exit and run composer There are some other commands recommended for advanced users only. More documentation about this: http://doc.tiki.org/Permission+Check @@ -796,8 +796,8 @@ o) WHAT='x'; command_open ;; q) exit ;; Q) exit ;; - x) exit ;; - X) exit ;; + x) composer ;; + X) composer ;; *) WHAT='x'; echo 'no such command' ;; esac done @@ -814,42 +814,45 @@ fi } -if [ ! -f temp/composer.phar ]; -then - if exists curl; +composer() +{ + if [ ! -f temp/composer.phar ]; then - curl -s https://getcomposer.org/installer | php -- --install-dir=temp + if exists curl; + then + curl -s https://getcomposer.org/installer | php -- --install-dir=temp + else + php -r "eval('?>'.file_get_contents('https://getcomposer.org/installer'));" -- --install-dir=temp + fi else - php -r "eval('?>'.file_get_contents('https://getcomposer.org/installer'));" -- --install-dir=temp + php temp/composer.phar self-update fi -else - php temp/composer.phar self-update -fi -if [ ! -f temp/composer.phar ]; -then - echo "We have failed to obtain the composer executable." - echo "NB: Maybe you are behing a proxy, just export https_proxy variable and relaunch setup.sh" - echo "1) Download it from http://getcomposer.org" - echo "2) Store it in temp/" - exit -fi + if [ ! -f temp/composer.phar ]; + then + echo "We have failed to obtain the composer executable." + echo "NB: Maybe you are behing a proxy, just export https_proxy variable and relaunch setup.sh" + echo "1) Download it from http://getcomposer.org" + echo "2) Store it in temp/" + exit + fi -N=0 -if exists php; -then - until php temp/composer.phar install --prefer-dist - do - if [ $N -eq 7 ]; - then - exit 2 - else - echo "Composer failed, retrying in 5 seconds, for a few times. Hit Ctrl-C to cancel." - sleep 5 - fi - ((N++)) - done -fi + N=0 + if exists php; + then + until php temp/composer.phar install --prefer-dist + do + if [ $N -eq 7 ]; + then + exit 1 + else + echo "Composer failed, retrying in 5 seconds, for a few times. Hit Ctrl-C to cancel." + sleep 5 + fi + ((N++)) + done + fi +} # part 5 - main program # --------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nk...@us...> - 2013-08-18 01:10:39
|
Revision: 47127 http://sourceforge.net/p/tikiwiki/code/47127 Author: nkoth Date: 2013-08-18 01:10:36 +0000 (Sun, 18 Aug 2013) Log Message: ----------- [FIX] Exit script after composer runs. Modified Paths: -------------- trunk/setup.sh Modified: trunk/setup.sh =================================================================== --- trunk/setup.sh 2013-08-18 00:58:55 UTC (rev 47126) +++ trunk/setup.sh 2013-08-18 01:10:36 UTC (rev 47127) @@ -844,7 +844,7 @@ do if [ $N -eq 7 ]; then - exit 1 + exit; else echo "Composer failed, retrying in 5 seconds, for a few times. Hit Ctrl-C to cancel." sleep 5 @@ -852,6 +852,7 @@ ((N++)) done fi + exit } # part 5 - main program This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nk...@us...> - 2013-08-18 01:13:31
|
Revision: 47128 http://sourceforge.net/p/tikiwiki/code/47128 Author: nkoth Date: 2013-08-18 01:13:28 +0000 (Sun, 18 Aug 2013) Log Message: ----------- [FIX] Clean up previous commit: semicolon Modified Paths: -------------- trunk/setup.sh Modified: trunk/setup.sh =================================================================== --- trunk/setup.sh 2013-08-18 01:10:36 UTC (rev 47127) +++ trunk/setup.sh 2013-08-18 01:13:28 UTC (rev 47128) @@ -844,7 +844,7 @@ do if [ $N -eq 7 ]; then - exit; + exit else echo "Composer failed, retrying in 5 seconds, for a few times. Hit Ctrl-C to cancel." sleep 5 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nk...@us...> - 2013-08-19 15:17:20
|
Revision: 47145 http://sourceforge.net/p/tikiwiki/code/47145 Author: nkoth Date: 2013-08-19 15:17:17 +0000 (Mon, 19 Aug 2013) Log Message: ----------- [FIX] Make composer run in non-interactive mode automatically, hence it broke show.tiki.org which uses non-interactive mode Modified Paths: -------------- trunk/setup.sh Modified: trunk/setup.sh =================================================================== --- trunk/setup.sh 2013-08-19 15:12:37 UTC (rev 47144) +++ trunk/setup.sh 2013-08-19 15:17:17 UTC (rev 47145) @@ -518,6 +518,10 @@ # chmod 664 robots.txt tiki-install.php echo " done." + + if [ -n "$OPT_NOTINTERACTIVE" ]; then + composer + fi } command_nothing() { @@ -543,6 +547,10 @@ chmod -R a=rwX . echo " done" + + if [ -n "$OPT_NOTINTERACTIVE" ]; then + composer + fi } permission_via_php_check() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fm...@us...> - 2013-09-12 16:09:30
|
Revision: 47428 http://sourceforge.net/p/tikiwiki/code/47428 Author: fmg-sf Date: 2013-09-12 16:09:26 +0000 (Thu, 12 Sep 2013) Log Message: ----------- [MOD] new default: composer [ENH] suphp file permission workaround Modified Paths: -------------- trunk/setup.sh Modified: trunk/setup.sh =================================================================== --- trunk/setup.sh 2013-09-12 14:18:37 UTC (rev 47427) +++ trunk/setup.sh 2013-09-12 16:09:26 UTC (rev 47428) @@ -386,6 +386,23 @@ done } +set_permission_data_suphp_workaround() { + # this is quick 'n dirty + # 600/601 does not work with .scc and images, as observed on Debian Wheezy + # + # first: classic paranoia-suphp + COMMAND="paranoia-suphp" + permission_via_php_check + # + # second: fix permissions of none-PHP files , really quick 'n dirty + ${CHMOD} -R o+r ./ + ${FIND} . -name "*.php" -exec ${CHMOD} o-r {} \; + ${FIND} . -type d -exec ${CHMOD} o-r {} \; + # + # reset $COMMAND , not really necessary + COMMAND="workaround" +} + yet_unused_permission_default() { ${CHMOD} -fR u=rwX,go=rX . } @@ -756,18 +773,21 @@ Tiki setup.sh - your options ============================ + c run composer and exit (recommended to be done first) + f fix (classic default) o open (classic option) predefined Tiki Permission Check models: ---------------------------------------- 1 paranoia 2 paranoia-suphp + w suphp workaround 3 sbox 4 mixed 5 worry 6 moreworry 7 pain 8 morepain 9 risky a insane - q quit x exit and run composer + q quit x exit There are some other commands recommended for advanced users only. More documentation about this: http://doc.tiki.org/Permission+Check @@ -777,7 +797,8 @@ tiki_setup_default() { dummy=foo - WHAT='f' + #WHAT='f' # old default + WHAT='c' # composer is recommended while true do tiki_setup_default_menu @@ -800,13 +821,16 @@ 8) WHAT='x'; COMMAND="morepain" ; permission_via_php_check ;; 9) WHAT='x'; COMMAND="risky" ; permission_via_php_check ;; a) WHAT='x'; COMMAND="insane" ; permission_via_php_check ;; + w) WHAT='x'; COMMAND="workaround" ; set_permission_data_suphp_workaround ;; c) WHAT='x'; clear ;; f) WHAT='x'; command_fix ;; o) WHAT='x'; command_open ;; + c) WHAT='f'; composer ;; + C) WHAT='f'; composer ;; q) exit ;; Q) exit ;; - x) composer ;; - X) composer ;; + x) exit ;; + X) exit ;; *) WHAT='x'; echo 'no such command' ;; esac done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fm...@us...> - 2013-09-12 16:15:19
|
Revision: 47429 http://sourceforge.net/p/tikiwiki/code/47429 Author: fmg-sf Date: 2013-09-12 16:15:16 +0000 (Thu, 12 Sep 2013) Log Message: ----------- [FIX] typo in comment Modified Paths: -------------- trunk/setup.sh Modified: trunk/setup.sh =================================================================== --- trunk/setup.sh 2013-09-12 16:09:26 UTC (rev 47428) +++ trunk/setup.sh 2013-09-12 16:15:16 UTC (rev 47429) @@ -388,7 +388,7 @@ set_permission_data_suphp_workaround() { # this is quick 'n dirty - # 600/601 does not work with .scc and images, as observed on Debian Wheezy + # 600/601 does not work with .css and images, as observed on Debian Wheezy # # first: classic paranoia-suphp COMMAND="paranoia-suphp" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fm...@us...> - 2013-09-12 18:27:20
|
Revision: 47431 http://sourceforge.net/p/tikiwiki/code/47431 Author: fmg-sf Date: 2013-09-12 18:27:18 +0000 (Thu, 12 Sep 2013) Log Message: ----------- [FIX] move order of functions, and use 'c' to run composer (clear screen is 'S' now) Modified Paths: -------------- trunk/setup.sh Modified: trunk/setup.sh =================================================================== --- trunk/setup.sh 2013-09-12 17:45:17 UTC (rev 47430) +++ trunk/setup.sh 2013-09-12 18:27:18 UTC (rev 47431) @@ -120,7 +120,7 @@ ${CAT} <<EOF Type 'fix', 'nothing' or 'open' as command argument. If you used Tiki Permission Check via PHP, you know which of the following commands will probably work: -insane mixed morepain moreworry pain paranoia paranoia-suphp risky sbox worry +insane mixed morepain moreworry pain paranoia paranoia-suphp workaround risky sbox worry There are some other commands recommended for advanced users only. More documentation about this: http://doc.tiki.org/Permission+Check @@ -795,47 +795,6 @@ EOF } -tiki_setup_default() { - dummy=foo - #WHAT='f' # old default - WHAT='c' # composer is recommended - while true - do - tiki_setup_default_menu - echo -n "Your choice [${WHAT}]? " - read INPUT - if [ -z ${INPUT} ] ; then - DUMMY=foo - else - WHAT=${INPUT} - fi - case ${WHAT} in - 0) WHAT='x'; COMMAND="php" ; permission_via_php_check ;; - 1) WHAT='x'; COMMAND="paranoia" ; permission_via_php_check ;; - 2) WHAT='x'; COMMAND="paranoia-suphp" ; permission_via_php_check ;; - 3) WHAT='x'; COMMAND="sbox" ; permission_via_php_check ;; - 4) WHAT='x'; COMMAND="mixed" ; permission_via_php_check ;; - 5) WHAT='x'; COMMAND="worry" ; permission_via_php_check ;; - 6) WHAT='x'; COMMAND="moreworry" ; permission_via_php_check ;; - 7) WHAT='x'; COMMAND="pain" ; permission_via_php_check ;; - 8) WHAT='x'; COMMAND="morepain" ; permission_via_php_check ;; - 9) WHAT='x'; COMMAND="risky" ; permission_via_php_check ;; - a) WHAT='x'; COMMAND="insane" ; permission_via_php_check ;; - w) WHAT='x'; COMMAND="workaround" ; set_permission_data_suphp_workaround ;; - c) WHAT='x'; clear ;; - f) WHAT='x'; command_fix ;; - o) WHAT='x'; command_open ;; - c) WHAT='f'; composer ;; - C) WHAT='f'; composer ;; - q) exit ;; - Q) exit ;; - x) exit ;; - X) exit ;; - *) WHAT='x'; echo 'no such command' ;; - esac - done -} - # Set-up and execute composer to obtain dependencies exists() { @@ -888,11 +847,53 @@ exit } +tiki_setup_default() { + dummy=foo + #WHAT='f' # old default + WHAT='c' # composer is recommended + while true + do + tiki_setup_default_menu + echo -n "Your choice [${WHAT}]? " + read INPUT + if [ -z ${INPUT} ] ; then + DUMMY=foo + else + WHAT=${INPUT} + fi + case ${WHAT} in + 0) WHAT='x'; COMMAND="php" ; permission_via_php_check ;; + 1) WHAT='x'; COMMAND="paranoia" ; permission_via_php_check ;; + 2) WHAT='x'; COMMAND="paranoia-suphp" ; permission_via_php_check ;; + 3) WHAT='x'; COMMAND="sbox" ; permission_via_php_check ;; + 4) WHAT='x'; COMMAND="mixed" ; permission_via_php_check ;; + 5) WHAT='x'; COMMAND="worry" ; permission_via_php_check ;; + 6) WHAT='x'; COMMAND="moreworry" ; permission_via_php_check ;; + 7) WHAT='x'; COMMAND="pain" ; permission_via_php_check ;; + 8) WHAT='x'; COMMAND="morepain" ; permission_via_php_check ;; + 9) WHAT='x'; COMMAND="risky" ; permission_via_php_check ;; + a) WHAT='x'; COMMAND="insane" ; permission_via_php_check ;; + w) WHAT='x'; COMMAND="workaround" ; set_permission_data_suphp_workaround ;; + S) WHAT='x'; clear ;; + f) WHAT='x'; command_fix ;; + o) WHAT='x'; command_open ;; + c) WHAT='f'; composer ;; + C) WHAT='f'; composer ;; + q) exit ;; + Q) exit ;; + x) exit ;; + X) exit ;; + *) WHAT='x'; echo 'no such command' ;; + esac + done +} + # part 5 - main program # --------------------- case ${COMMAND} in # free defined + # default is used if no parameter at command line is given default) tiki_setup_default ;; fix) command_fix ;; menu) tiki_setup_default ;; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fm...@us...> - 2013-09-12 19:06:47
|
Revision: 47434 http://sourceforge.net/p/tikiwiki/code/47434 Author: fmg-sf Date: 2013-09-12 19:06:42 +0000 (Thu, 12 Sep 2013) Log Message: ----------- [ENH] command line suphp workaround and similar workaround for sbox Modified Paths: -------------- trunk/setup.sh Modified: trunk/setup.sh =================================================================== --- trunk/setup.sh 2013-09-12 19:04:14 UTC (rev 47433) +++ trunk/setup.sh 2013-09-12 19:06:42 UTC (rev 47434) @@ -386,8 +386,28 @@ done } -set_permission_data_suphp_workaround() { +set_permission_data_workaround_general() { # this is quick 'n dirty + ${CHMOD} -R o+r ./ + ${FIND} . -name "*.php" -exec ${CHMOD} o-r {} \; + ${FIND} . -type d -exec ${CHMOD} o-r {} \; +} + +set_permission_data_workaround_sbox() { + # 500 might not work with .css and images, not yet observed + # + # first: classic sbox + COMMAND="sbox" + permission_via_php_check + # + # second: fix permissions of none-PHP files , really quick 'n dirty + set_permission_data_workaround_general + # + # reset $COMMAND , not really necessary + COMMAND="sboxworkaround" +} + +set_permission_data_workaround_suphp() { # 600/601 does not work with .css and images, as observed on Debian Wheezy # # first: classic paranoia-suphp @@ -395,12 +415,10 @@ permission_via_php_check # # second: fix permissions of none-PHP files , really quick 'n dirty - ${CHMOD} -R o+r ./ - ${FIND} . -name "*.php" -exec ${CHMOD} o-r {} \; - ${FIND} . -type d -exec ${CHMOD} o-r {} \; + set_permission_data_workaround_general # # reset $COMMAND , not really necessary - COMMAND="workaround" + COMMAND="suphpworkaround" } yet_unused_permission_default() { @@ -776,13 +794,15 @@ c run composer and exit (recommended to be done first) f fix (classic default) o open (classic option) + S clear screen predefined Tiki Permission Check models: ---------------------------------------- - 1 paranoia 2 paranoia-suphp - w suphp workaround - 3 sbox 4 mixed + 1 paranoia + 2 paranoia-suphp w suphp workaround + 3 sbox W sbox workaround + 4 mixed 5 worry 6 moreworry 7 pain 8 morepain 9 risky a insane @@ -873,7 +893,8 @@ 8) WHAT='x'; COMMAND="morepain" ; permission_via_php_check ;; 9) WHAT='x'; COMMAND="risky" ; permission_via_php_check ;; a) WHAT='x'; COMMAND="insane" ; permission_via_php_check ;; - w) WHAT='x'; COMMAND="workaround" ; set_permission_data_suphp_workaround ;; + w) WHAT='x'; COMMAND="suphpworkaround" ; set_permission_data_workaround_suphp ;; + W) WHAT='x'; COMMAND="sboxworkaround" ; set_permission_data_workaround_sbox ;; S) WHAT='x'; clear ;; f) WHAT='x'; command_fix ;; o) WHAT='x'; command_open ;; @@ -894,50 +915,52 @@ case ${COMMAND} in # free defined # default is used if no parameter at command line is given - default) tiki_setup_default ;; - fix) command_fix ;; - menu) tiki_setup_default ;; - nothing) command_nothing ;; - open) command_open ;; + default) tiki_setup_default ;; + fix) command_fix ;; + menu) tiki_setup_default ;; + nothing) command_nothing ;; + open) command_open ;; # Tiki Permission Check (via PHP) - insane) permission_via_php_check ;; - mixed) permission_via_php_check ;; - morepain) permission_via_php_check ;; - moreworry) permission_via_php_check ;; - pain) permission_via_php_check ;; - paranoia) permission_via_php_check ;; - paranoia-suphp) permission_via_php_check ;; - php) permission_via_php_check ;; - risky) permission_via_php_check ;; - sbox) permission_via_php_check ;; - worry) permission_via_php_check ;; + insane) permission_via_php_check ;; + mixed) permission_via_php_check ;; + morepain) permission_via_php_check ;; + moreworry) permission_via_php_check ;; + pain) permission_via_php_check ;; + paranoia) permission_via_php_check ;; + paranoia-suphp) permission_via_php_check ;; + php) permission_via_php_check ;; + risky) permission_via_php_check ;; + sbox) permission_via_php_check ;; + sboxworkaround) set_permission_data_workaround_sbox ;; + suphpworkaround) set_permission_data_workaround_suphp ;; + worry) permission_via_php_check ;; # plain chmod - gmr) set_group_minus_read ;; - gmw) set_group_minus_write ;; - gmx) set_group_minus_execute ;; - gpr) set_group_plus_read ;; - gpw) set_group_plus_write ;; - gpx) set_group_plus_execute ;; - omr) set_other_minus_read ;; - omw) set_other_minus_write ;; - omx) set_other_minus_execute ;; - opr) set_other_plus_read ;; - opw) set_other_plus_write ;; - opx) set_other_plus_execute ;; - umw) set_user_minus_write ;; - upr) set_user_plus_read ;; - upw) set_user_plus_write ;; - upx) set_user_plus_execute ;; + gmr) set_group_minus_read ;; + gmw) set_group_minus_write ;; + gmx) set_group_minus_execute ;; + gpr) set_group_plus_read ;; + gpw) set_group_plus_write ;; + gpx) set_group_plus_execute ;; + omr) set_other_minus_read ;; + omw) set_other_minus_write ;; + omx) set_other_minus_execute ;; + opr) set_other_plus_read ;; + opw) set_other_plus_write ;; + opx) set_other_plus_execute ;; + umw) set_user_minus_write ;; + upr) set_user_plus_read ;; + upw) set_user_plus_write ;; + upx) set_user_plus_execute ;; # special chmod - sdgmw) special_dirs_set_group_minus_write ;; - sdgpw) special_dirs_set_group_plus_write ;; - sdomw) special_dirs_set_other_minus_write ;; - sdopw) special_dirs_set_other_plus_write ;; - sdumw) special_dirs_set_user_minus_write ;; - sdupw) special_dirs_set_user_plus_write ;; - foo) echo foo ;; - #*) echo ${HINT_FOR_USER} ;; - *) hint_for_users ;; + sdgmw) special_dirs_set_group_minus_write ;; + sdgpw) special_dirs_set_group_plus_write ;; + sdomw) special_dirs_set_other_minus_write ;; + sdopw) special_dirs_set_other_plus_write ;; + sdumw) special_dirs_set_user_minus_write ;; + sdupw) special_dirs_set_user_plus_write ;; + foo) echo foo ;; + #*) echo ${HINT_FOR_USER} ;; + *) hint_for_users ;; esac exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fm...@us...> - 2013-09-19 16:50:25
|
Revision: 47575 http://sourceforge.net/p/tikiwiki/code/47575 Author: fmg-sf Date: 2013-09-19 16:50:22 +0000 (Thu, 19 Sep 2013) Log Message: ----------- [ENH] default command is composer Modified Paths: -------------- trunk/setup.sh Modified: trunk/setup.sh =================================================================== --- trunk/setup.sh 2013-09-19 16:41:46 UTC (rev 47574) +++ trunk/setup.sh 2013-09-19 16:50:22 UTC (rev 47575) @@ -30,6 +30,7 @@ USE_CASES_FILE="usecases.bin" USE_CASES_PATH=${PERMISSIONCHECK_DIR} USE_CASES_NAME=${USE_CASES_PATH}/${USE_CASES_FILE} +DEFAULT_WHAT='c' define_path() { # define PATH for executable mode @@ -882,22 +883,22 @@ WHAT=${INPUT} fi case ${WHAT} in - 0) WHAT='x'; COMMAND="php" ; permission_via_php_check ;; - 1) WHAT='x'; COMMAND="paranoia" ; permission_via_php_check ;; - 2) WHAT='x'; COMMAND="paranoia-suphp" ; permission_via_php_check ;; - 3) WHAT='x'; COMMAND="sbox" ; permission_via_php_check ;; - 4) WHAT='x'; COMMAND="mixed" ; permission_via_php_check ;; - 5) WHAT='x'; COMMAND="worry" ; permission_via_php_check ;; - 6) WHAT='x'; COMMAND="moreworry" ; permission_via_php_check ;; - 7) WHAT='x'; COMMAND="pain" ; permission_via_php_check ;; - 8) WHAT='x'; COMMAND="morepain" ; permission_via_php_check ;; - 9) WHAT='x'; COMMAND="risky" ; permission_via_php_check ;; - a) WHAT='x'; COMMAND="insane" ; permission_via_php_check ;; - w) WHAT='x'; COMMAND="suphpworkaround" ; set_permission_data_workaround_suphp ;; - W) WHAT='x'; COMMAND="sboxworkaround" ; set_permission_data_workaround_sbox ;; - S) WHAT='x'; clear ;; - f) WHAT='x'; command_fix ;; - o) WHAT='x'; command_open ;; + 0) WHAT=${DEFAULT_WHAT} ; COMMAND="php" ; permission_via_php_check ;; + 1) WHAT=${DEFAULT_WHAT} ; COMMAND="paranoia" ; permission_via_php_check ;; + 2) WHAT=${DEFAULT_WHAT} ; COMMAND="paranoia-suphp" ; permission_via_php_check ;; + 3) WHAT=${DEFAULT_WHAT} ; COMMAND="sbox" ; permission_via_php_check ;; + 4) WHAT=${DEFAULT_WHAT} ; COMMAND="mixed" ; permission_via_php_check ;; + 5) WHAT=${DEFAULT_WHAT} ; COMMAND="worry" ; permission_via_php_check ;; + 6) WHAT=${DEFAULT_WHAT} ; COMMAND="moreworry" ; permission_via_php_check ;; + 7) WHAT=${DEFAULT_WHAT} ; COMMAND="pain" ; permission_via_php_check ;; + 8) WHAT=${DEFAULT_WHAT} ; COMMAND="morepain" ; permission_via_php_check ;; + 9) WHAT=${DEFAULT_WHAT} ; COMMAND="risky" ; permission_via_php_check ;; + a) WHAT=${DEFAULT_WHAT} ; COMMAND="insane" ; permission_via_php_check ;; + w) WHAT=${DEFAULT_WHAT} ; COMMAND="suphpworkaround" ; set_permission_data_workaround_suphp ;; + W) WHAT=${DEFAULT_WHAT} ; COMMAND="sboxworkaround" ; set_permission_data_workaround_sbox ;; + S) WHAT=${DEFAULT_WHAT} ; clear ;; + f) WHAT=${DEFAULT_WHAT} ; command_fix ;; + o) WHAT=${DEFAULT_WHAT} ; command_open ;; c) WHAT='f'; composer ;; C) WHAT='f'; composer ;; q) exit ;; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fm...@us...> - 2013-10-01 14:04:11
|
Revision: 47818 http://sourceforge.net/p/tikiwiki/code/47818 Author: fmg-sf Date: 2013-10-01 14:04:09 +0000 (Tue, 01 Oct 2013) Log Message: ----------- [ENH] Next predefined option after [f]ixing is e[x]it, keep previous predefined option after 'clear [S]creen' Modified Paths: -------------- trunk/setup.sh Modified: trunk/setup.sh =================================================================== --- trunk/setup.sh 2013-10-01 13:19:02 UTC (rev 47817) +++ trunk/setup.sh 2013-10-01 14:04:09 UTC (rev 47818) @@ -31,6 +31,8 @@ USE_CASES_PATH=${PERMISSIONCHECK_DIR} USE_CASES_NAME=${USE_CASES_PATH}/${USE_CASES_FILE} DEFAULT_WHAT='c' +WHAT_NEXT_AFTER_c='f' +WHAT_NEXT_AFTER_f='x' define_path() { # define PATH for executable mode @@ -880,6 +882,7 @@ if [ -z ${INPUT} ] ; then DUMMY=foo else + OLDWHAT=${WHAT} WHAT=${INPUT} fi case ${WHAT} in @@ -896,11 +899,11 @@ a) WHAT=${DEFAULT_WHAT} ; COMMAND="insane" ; permission_via_php_check ;; w) WHAT=${DEFAULT_WHAT} ; COMMAND="suphpworkaround" ; set_permission_data_workaround_suphp ;; W) WHAT=${DEFAULT_WHAT} ; COMMAND="sboxworkaround" ; set_permission_data_workaround_sbox ;; - S) WHAT=${DEFAULT_WHAT} ; clear ;; - f) WHAT=${DEFAULT_WHAT} ; command_fix ;; + S) WHAT=${OLDWHAT} ; clear ;; + f) WHAT=$WHAT_NEXT_AFTER_f ; command_fix ;; o) WHAT=${DEFAULT_WHAT} ; command_open ;; - c) WHAT='f'; composer ;; - C) WHAT='f'; composer ;; + c) WHAT=$WHAT_NEXT_AFTER_c ; composer ;; + C) WHAT=$WHAT_NEXT_AFTER_c ; composer ;; q) exit ;; Q) exit ;; x) exit ;; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fm...@us...> - 2014-05-11 19:59:28
|
Revision: 51229 http://sourceforge.net/p/tikiwiki/code/51229 Author: fmg-sf Date: 2014-05-11 19:59:25 +0000 (Sun, 11 May 2014) Log Message: ----------- [ENH] list of directories for chmod Modified Paths: -------------- trunk/setup.sh Modified: trunk/setup.sh =================================================================== --- trunk/setup.sh 2014-05-11 16:57:34 UTC (rev 51228) +++ trunk/setup.sh 2014-05-11 19:59:25 UTC (rev 51229) @@ -254,10 +254,12 @@ check_distribution -# part 3 - writable subdirs -# ------------------------- +# part 3 - default and writable subdirs +# ------------------------------------- -DIRS="db dump img/wiki img/wiki_up img/trackers modules/cache temp temp/cache temp/public templates_c templates styles maps whelp mods files tiki_tests/tests temp/unified-index" +DIR_LIST_DEFAULT="admin css db doc dump files img installer lang lib maps modules permissioncheck styles temp templates templates_c tests tiki_tests vendor vendor_extra whelp" +DIR_LIST_WRITABLE="db dump img/wiki img/wiki_up img/trackers modules/cache temp temp/cache temp/public templates_c templates styles maps whelp mods files tiki_tests/tests temp/unified-index" +DIRS=${DIR_LIST_WRITABLE} # part 4 - several functions # -------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fm...@us...> - 2014-05-11 20:05:06
|
Revision: 51230 http://sourceforge.net/p/tikiwiki/code/51230 Author: fmg-sf Date: 2014-05-11 20:05:02 +0000 (Sun, 11 May 2014) Log Message: ----------- [ENH] documentation URL with https Modified Paths: -------------- trunk/setup.sh Modified: trunk/setup.sh =================================================================== --- trunk/setup.sh 2014-05-11 19:59:25 UTC (rev 51229) +++ trunk/setup.sh 2014-05-11 20:05:02 UTC (rev 51230) @@ -126,7 +126,7 @@ HINT_FOR_USER="\nType 'fix', 'nothing' or 'open' as command argument. \nIf you used Tiki Permission Check via PHP, you know which of the following commands will probably work: \ninsane mixed morepain moreworry pain paranoia paranoia-suphp risky sbox worry -\nMore documentation: http://doc.tiki.org/Permission+Check\n" +\nMore documentation: https://doc.tiki.org/Permission+Check\n" hint_for_users() { ${CAT} <<EOF @@ -135,7 +135,7 @@ insane mixed morepain moreworry pain paranoia paranoia-suphp workaround risky sbox worry There are some other commands recommended for advanced users only. -More documentation about this: http://doc.tiki.org/Permission+Check +More documentation about this: https://doc.tiki.org/Permission+Check EOF } @@ -154,7 +154,7 @@ -d off|on disable|enable debugging mode (override script default) There are some other commands recommended for advanced users only. -More documentation about this: http://doc.tiki.org/Permission+Check +More documentation about this: https://doc.tiki.org/Permission+Check EOF } @@ -887,7 +887,7 @@ q quit x exit There are some other commands recommended for advanced users only. -More documentation about this: http://doc.tiki.org/Permission+Check +More documentation about this: https://doc.tiki.org/Permission+Check EOF } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fm...@us...> - 2014-05-11 20:19:18
|
Revision: 51231 http://sourceforge.net/p/tikiwiki/code/51231 Author: fmg-sf Date: 2014-05-11 20:19:15 +0000 (Sun, 11 May 2014) Log Message: ----------- [ENH] chmod only directories in whitelist - part I Modified Paths: -------------- trunk/setup.sh Modified: trunk/setup.sh =================================================================== --- trunk/setup.sh 2014-05-11 20:05:02 UTC (rev 51230) +++ trunk/setup.sh 2014-05-11 20:19:15 UTC (rev 51231) @@ -378,14 +378,15 @@ } set_permission_data() { - if [ ${DEBUG} = '1' ] ; then - echo ${DEBUG_PREFIX} - echo ${DEBUG_PREFIX} ${FIND} . -type d -exec ${CHMOD} ${MODEL_PERMS_SUBDIRS} {} \; - echo ${DEBUG_PREFIX} ${FIND} . -type f -exec ${CHMOD} ${MODEL_PERMS_FILES} {} \; - fi + for DEFAULT_DIR in ${DIR_LIST_DEFAULT} ; do + if [ ${DEBUG} = '1' ] ; then + echo ${DEBUG_PREFIX} + echo ${DEBUG_PREFIX} ${FIND} ${DEFAULT_DIR} -type d -exec ${CHMOD} ${MODEL_PERMS_SUBDIRS} {} \; + echo ${DEBUG_PREFIX} ${FIND} ${DEFAULT_DIR} -type f -exec ${CHMOD} ${MODEL_PERMS_FILES} {} \; + fi #debug_breakpoint - ${FIND} . -type d -exec ${CHMOD} ${MODEL_PERMS_SUBDIRS} {} \; - ${FIND} . -type f -exec ${CHMOD} ${MODEL_PERMS_FILES} {} \; + ${FIND} ${DEFAULT_DIR} -type d -exec ${CHMOD} ${MODEL_PERMS_SUBDIRS} {} \; + ${FIND} ${DEFAULT_DIR} -type f -exec ${CHMOD} ${MODEL_PERMS_FILES} {} \; #set_permission_dirs_special_write for WRITABLE in $DIRS ; do if [ -d ${WRITABLE} ] ; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |