diff --git a/ChangeLog b/ChangeLog index 09e87a1..0def9e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-01-29 11:41:37 Tim Janik + + * install.sh: update to match my local update-web script. + 2008-01-29 11:21:54 Tim Janik * removed tutorial2.0/ cruft. diff --git a/install.sh b/install.sh index 091d1fe..8afc5d7 100755 --- a/install.sh +++ b/install.sh @@ -1,36 +1,24 @@ #!/bin/sh -CVSDIR=`pwd` - -if test "x$1" != x ; then - INSTALLDIR=$1 -else - echo 2>&1 "Usage: install.sh DESTDIR" - exit 1 -fi - -rsync -rlt --omit-dir-times --delete --exclude-from=$CVSDIR/install.exclude $CVSDIR/ $INSTALLDIR/ - -make_link () { - from=$1 - to=$2 - - todir=`dirname $to` - tobase=`basename $to` - - ( cd $INSTALLDIR/$todir && rm -f $tobase && ln -s ../$from $tobase ) +# update gtk.org +# /home/timj/svn/gtk-web/install.sh /web/gtk # not called directly to prevent forged commands +# diff -up update-web /home/timj/svn/gtk-web/install.sh +true && { + SRCDIR=/home/timj/svn/gtk-web + INSTALLDIR=/web/gtk + cd $SRCDIR + svn update + + rsync -rlt --delete --omit-dir-times --exclude-from=$SRCDIR/install.exclude $SRCDIR/ $INSTALLDIR/ + + for dir in api beos download faq screenshots success plan plan/2.4 plan/2.6 plan/2.8 plan/2.10 plan/ideas plan/meetings ; do + for page in site_top.html site_bottom.html box_middle.html box_end.html box_begin.html section_end.html section_begin.html ; do + ( cd $INSTALLDIR/$dir/ && rm -f $page && ln -s ../$page $page ) + done + done + + ( cd $INSTALLDIR + find . ! -group gtk -exec chgrp gtk \{\} \; + find . -type f -a ! -perm -0060 -exec chmod g+rw \{\} \; + find . -type d -a ! -perm -0070 -exec chmod g+rwx \{\} \; ) } - -for i in api beos download faq screenshots success plan plan/2.4 plan/2.6 plan/2.8 plan/2.10 plan/ideas plan/meetings ; do - for j in site_top.html site_bottom.html box_middle.html box_end.html box_begin.html section_end.html section_begin.html ; do - make_link $j $i/$j - done -done - -( cd $INSTALLDIR && ln -s tutorial2.0 tutorial ) - -( cd $INSTALLDIR - find . ! -group gtk -exec chgrp gtk \{\} \; - find . -type f -a ! -perm -0060 -exec chmod g+rw \{\} \; - find . -type d -a ! -perm -0070 -exec chmod g+rwx \{\} \; ) -