slitaz-modular rev 46
Add update-repos to local-mirror script. Added more variables to local-mirror.conf.
| author | Christopher Rogers <slaxemulator@gmail.com> |
|---|---|
| date | Tue Apr 05 13:25:24 2011 +0000 (2011-04-05) |
| parents | 4f2f1fed0f9b |
| children | 3aef7db954d0 |
| files | initramfs/etc/local-mirror.conf initramfs/usr/bin/local-mirror |
line diff
1.1 --- a/initramfs/etc/local-mirror.conf Tue Apr 05 13:22:18 2011 +0000 1.2 +++ b/initramfs/etc/local-mirror.conf Tue Apr 05 13:25:24 2011 +0000 1.3 @@ -15,7 +15,16 @@ 1.4 VHOST_TANK_FILE="/etc/lighttpd/vhosts-local-tank.conf" 1.5 REPOS_DIR="/home/slitaz/repos" 1.6 REPOS_WEB_DIR="/home/slitaz/repos-web" 1.7 -WWW_DIR="/home/slitaz/www" 1.8 + 1.9 +#repos folders for website 1.10 +PEOPLE_WWW_DIR="$REPOS_DIR/slitaz-forge/people" 1.11 +DOC_WWW_DIR="$REPOS_DIR/slitaz-forge/doc" 1.12 +PIZZA_WWW_DIR="$REPOS_DIR/slitaz-pizza/php" 1.13 +BOOT_WWW_DIR="$REPOS_DIR/slitaz-forge/boot/web" 1.14 +TANK_WWW_DIR="$REPOS_DIR/slitaz-forge/tank/web" 1.15 + 1.16 +MAIN_WWW_DIR="/home/slitaz/www" 1.17 + 1.18 STABLE="/home/slitaz/stable" 1.19 COOKING="/home/slitaz/cooking" 1.20 #PKGDIR
2.1 --- a/initramfs/usr/bin/local-mirror Tue Apr 05 13:22:18 2011 +0000 2.2 +++ b/initramfs/usr/bin/local-mirror Tue Apr 05 13:25:24 2011 +0000 2.3 @@ -11,7 +11,7 @@ 2.4 2.5 usage() { 2.6 echo "$0 $VERSION" 2.7 - echo "$0 [on|off|tank-only|mirror-only]" 2.8 + echo "$0 [on|off|update-repos|tank-only|mirror-only]" 2.9 exit 1 2.10 } 2.11 2.12 @@ -28,47 +28,50 @@ 2.13 fi 2.14 2.15 [ -d $REPOS_DIR ] || continue 2.16 -[ -d $WWW_DIR ] || mkdir -p $WWW_DIR 2.17 -[ -L /var/www/vhosts ] || ln -sf $WWW_DIR /var/www/vhosts 2.18 +[ -d $MAIN_WWW_DIR ] || mkdir -p $MAIN_WWW_DIR 2.19 +[ -L /var/www/vhosts ] || ln -sf $MAIN_WWW_DIR /var/www/vhosts 2.20 2.21 www() { 2.22 b=$1 2.23 case "$b" in 2.24 website) 2.25 - [ -d $REPOS_DIR/$b ] && ln -s $REPOS_DIR/$b $WWW_DIR 2.26 + [ -d $REPOS_DIR/$b ] && ln -s $REPOS_DIR/$b $MAIN_WWW_DIR 2.27 ;; 2.28 people) 2.29 - [ -d $REPOS_DIR/slitaz-forge/people ] && ln -s $REPOS_DIR/slitaz-forge/people $WWW_DIR/people 2.30 + [ -d $REPOS_DIR/slitaz-forge/people ] && ln -s $REPOS_DIR/slitaz-forge/people $MAIN_WWW_DIR/people 2.31 ;; 2.32 doc) 2.33 - [ -d $REPOS_DIR/slitaz-forge/doc ] && cp -a $REPOS_DIR/slitaz-forge/doc $WWW_DIR/doc 2.34 - [ -d /var/www/dokuwiki ] && cp -a /var/www/dokuwiki/* $WWW_DIR/doc 2.35 + [ -d $DOC_WWW_DIR ] && cp -a $DOC_WWW_DIR $MAIN_WWW_DIR/doc 2.36 + [ -d /var/www/dokuwiki ] && cp -a /var/www/dokuwiki/* $MAIN_WWW_DIR/doc 2.37 VAR="index media pages" 2.38 for i in $VAR; do 2.39 - [ -d $REPOS_DIR/slitaz-doc-wiki-data ] && cp -a $REPOS_DIR/slitaz-doc-wiki-data/$i $WWW_DIR/doc/data 2.40 + [ -d $REPOS_DIR/slitaz-doc-wiki-data ] && cp -a $REPOS_DIR/slitaz-doc-wiki-data/$i $MAIN_WWW_DIR/doc/data 2.41 done 2.42 - [ -d $REPOS_DIR/slitaz-doc-wiki-data/plugins ] && cp -a $REPOS_DIR/slitaz-doc-wiki-data/plugins $WWW_DIR/doc/lib 2.43 - chown root.root -R $WWW_DIR/doc 2.44 - chmod 777 -R $WWW_DIR/doc 2.45 + [ -d $REPOS_DIR/slitaz-doc-wiki-data/plugins ] && cp -a $REPOS_DIR/slitaz-doc-wiki-data/plugins $MAIN_WWW_DIR/doc/lib 2.46 + chown root.root -R $MAIN_WWW_DIR/doc 2.47 + chmod 777 -R $MAIN_WWW_DIR/doc 2.48 ;; 2.49 pizza) 2.50 - [ -d $REPOS_DIR/slitaz-pizza/php ] && ln -sf $REPOS_DIR/slitaz-pizza/php $WWW_DIR/pizza 2.51 + [ -d $PIZZA_WWW_DIR ] && ln -sf $PIZZA_WWW_DIR $MAIN_WWW_DIR/pizza 2.52 ;; 2.53 bb) 2.54 - [ -d /usr/share/slitaz/web-bb ] && cp -a /usr/share/slitaz/web-bb $WWW_DIR/bb 2.55 - #[ -d /usr/share/slitaz/web ] && cp -a /usr/share/slitaz/web $WWW_DIR/bb/web 2.56 - [ -d $REPOS_DIR/website/pics ] && ln -sf $REPOS_DIR/website/pics $WWW_DIR/bb/pics 2.57 + [ -d /usr/share/slitaz/web-bb ] && cp -a /usr/share/slitaz/web-bb $MAIN_WWW_DIR/bb 2.58 + #[ -d /usr/share/slitaz/web ] && cp -a /usr/share/slitaz/web $MAIN_WWW_DIR/bb/web 2.59 + [ -d $REPOS_DIR/website/pics ] && ln -sf $REPOS_DIR/website/pics $MAIN_WWW_DIR/bb/pics 2.60 [ -d $COOKING/wok ] || ln -sf $REPOS_DIR/wok $COOKING/clean-wok 2.61 + [ -d $COOKING/wok ] || ln -sf $REPOS_DIR/wok $COOKING/wok 2.62 [ -d $STABLE/wok ] || ln -sf $REPOS_DIR/wok-stable $STABLE/clean-wok 2.63 - echo -e "$WWW_DIR/bb" | tazwok webserver on 2.64 + [ -d $STABLE/wok ] || ln -sf $REPOS_DIR/wok-stable $STABLE/wok 2.65 + [ -f $SRCDIR/sources.list ] || tazwok gen-src $SRCDIR 2.66 + echo -e "$MAIN_WWW_DIR/bb" | tazwok webserver on 2.67 ;; 2.68 pkgs) 2.69 - [ -d $wWW_DIR/pkgs ] || mkdir -p $WWW_DIR/pkgs 2.70 + [ -d $MAIN_WWW_DIR/pkgs ] || mkdir -p $MAIN_WWW_DIR/pkgs 2.71 2.72 - #[ -d /var/lib/tazpkg-web/style ] && cp -a /var/lib/tazpkg-web/style/* $WWW_DIR/pkgs 2.73 - #[ -f /var/lib/tazpkg-web/search.cgi ] && cp -a /var/lib/tazpkg-web/search.cgi $WWW_DIR/pkgs 2.74 - [ -d $REPOS_DIR/slitaz-dev-tools/tazpkg-web/style ] && cp -a $REPOS_DIR/slitaz-dev-tools/tazpkg-web/style/* $WWW_DIR/pkgs 2.75 - [ -d $REPOS_DIR/slitaz-dev-tools/tazpkg-web/search.cgi ] && cp -a $REPOS_DIR/slitaz-dev-tools/tazpkg-web/search.cgi $WWW_DIR/pkgs 2.76 + #[ -d /var/lib/tazpkg-web/style ] && cp -a /var/lib/tazpkg-web/style/* $MAIN_WWW_DIR/pkgs 2.77 + #[ -f /var/lib/tazpkg-web/search.cgi ] && cp -a /var/lib/tazpkg-web/search.cgi $MAIN_WWW_DIR/pkgs 2.78 + [ -d $REPOS_DIR/slitaz-dev-tools/tazpkg-web/style ] && cp -a $REPOS_DIR/slitaz-dev-tools/tazpkg-web/style/* $MAIN_WWW_DIR/pkgs 2.79 + [ -f $REPOS_DIR/slitaz-dev-tools/tazpkg-web/search.cgi ] && cp -a $REPOS_DIR/slitaz-dev-tools/tazpkg-web/search.cgi $MAIN_WWW_DIR/pkgs 2.80 [ -d $COOKING ] || mkdir -p $COOKING 2.81 [ -d $STABLE ] || mkdir -p $STABLE 2.82 [ -d $REPOS_DIR/flavors ] && ln -sf $REPOS_DIR/flavors $COOKING/flavors 2.83 @@ -79,23 +82,23 @@ 2.84 [ -d $SRCDIR ] && ln -sf $SRCDIR /home/slitaz/$(cat /etc/slitaz-release)/src 2.85 ;; 2.86 mirror) 2.87 - [ -d $REPOS_DIR/slitaz-dev-tools/mirror-tools/mirror-info ] && cp -a $REPOS_DIR/slitaz-dev-tools/mirror-tools/mirror-info $WWW_DIR 2.88 - [ -d $REPOS_DIR/slitaz-dev-tools/mirror-tools/slitaz ] && cp -a $REPOS_DIR/slitaz-dev-tools/mirror-tools/slitaz $WWW_DIR 2.89 - [ -d $WWW_DIR/slitaz/mirror/packages ] || mkdir -p $WWW_DIR/slitaz/mirror/packages 2.90 - [ -d $PKGDIR ] && ln -sf $PKGDIR $WWW_DIR/slitaz/mirror/packages/$(cat /etc/slitaz-release) 2.91 + [ -d $REPOS_DIR/slitaz-dev-tools/mirror-tools/mirror-info ] && cp -a $REPOS_DIR/slitaz-dev-tools/mirror-tools/mirror-info $MAIN_WWW_DIR 2.92 + [ -d $REPOS_DIR/slitaz-dev-tools/mirror-tools/slitaz ] && cp -a $REPOS_DIR/slitaz-dev-tools/mirror-tools/slitaz $MAIN_WWW_DIR 2.93 + [ -d $MAIN_WWW_DIR/slitaz/mirror/packages ] || mkdir -p $MAIN_WWW_DIR/slitaz/mirror/packages 2.94 + [ -d $PKGDIR ] && ln -sf $PKGDIR $MAIN_WWW_DIR/slitaz/mirror/packages/$(cat /etc/slitaz-release) 2.95 if [ -d $SRCDIR ]; then 2.96 for i in $(ls $SRCDIR); do 2.97 - [ -d $WWW_DIR/slitaz/mirror/sources/packages/${i:0:1} ] || mkdir -p $WWW_DIR/slitaz/mirror/sources/packages/${i:0:1} 2.98 - [ -f $WWW_DIR/slitaz/mirror/sources/packages/${i:0:1}/$i ] || ln -s $SRCDIR/$i $WWW_DIR/slitaz/mirror/sources/packages/${i:0:1}/$i 2.99 + [ -d $MAIN_WWW_DIR/slitaz/mirror/sources/packages/${i:0:1} ] || mkdir -p $MAIN_WWW_DIR/slitaz/mirror/sources/packages/${i:0:1} 2.100 + [ -f $MAIN_WWW_DIR/slitaz/mirror/sources/packages/${i:0:1}/$i ] || ln -s $SRCDIR/$i $MAIN_WWW_DIR/slitaz/mirror/sources/packages/${i:0:1}/$i 2.101 done 2.102 fi 2.103 ;; 2.104 boot) 2.105 - [ -d $REPOS_DIR/slitaz-forge/$b/web ] && cp -a $REPOS_DIR/slitaz-forge/$b/web $WWW_DIR/$b 2.106 - [ -d $REPOS_DIR/website/pics ] && ln -sf $REPOS_DIR/website/pics $WWW_DIR/$b/pics 2.107 + [ -d $BOOT_WWW_DIR ] && cp -a $BOOT_WWW_DIR $MAIN_WWW_DIR/$b 2.108 + [ -d $REPOS_DIR/website/pics ] && ln -sf $REPOS_DIR/website/pics $MAIN_WWW_DIR/$b/pics 2.109 ;; 2.110 tank) 2.111 - [ -d $REPOS_DIR/slitaz-forge/$b/web ] && ln -sf $REPOS_DIR/slitaz-forge/$b/web $WWW_DIR/$b 2.112 + [ -d $TANK_WWW_DIR ] && ln -sf $TANK_WWW_DIR $MAIN_WWW_DIR/$b 2.113 [ -f /usr/share/awstats/extras/update ] && ln -sf /usr/share/awstats/extras/update /usr/sbin/awsupdate_all 2.114 [ -d $REPOS_DIR/slitaz-forge/$b/files/etc/awstats ] && cp -a $REPOS_DIR/slitaz-forge/$b/files/etc/awstats/* /etc/awstats 2.115 for i in $ADDRESS; do 2.116 @@ -106,13 +109,13 @@ 2.117 done 2.118 ;; 2.119 hg) 2.120 - [ -d $WWW_DIR/hg ] || mkdir -p $WWW_DIR/hg 2.121 - [ -f /usr/share/examples/mercurial/hgwebdir.cgi ] && cp -a /usr/share/examples/mercurial/hgwebdir.cgi $WWW_DIR/hg 2.122 + [ -d $MAIN_WWW_DIR/hg ] || mkdir -p $MAIN_WWW_DIR/hg 2.123 + [ -f /usr/share/examples/mercurial/hgwebdir.cgi ] && cp -a /usr/share/examples/mercurial/hgwebdir.cgi $MAIN_WWW_DIR/hg 2.124 [ -f $REPOS_DIR/slitaz-forge/tank/files/etc/mercurial/hgweb.config ] && cp -a $REPOS_DIR/slitaz-forge/tank/files/etc/mercurial/hgweb.config /etc/mercurial/hgweb.config 2.125 #[ -f /etc/mercurial/hgweb.conf ] && sed -i 's|style = slitaz|style = gitweb|g' /etc/mercurial/hgweb.config 2.126 ;; 2.127 lfs) 2.128 - [ -d $WWW_DIR/lfs ] || ln -sf /usr/share/doc/lfs-book $WWW_DIR/lfs 2.129 + [ -d $MAIN_WWW_DIR/lfs ] || ln -sf /usr/share/doc/lfs-book $MAIN_WWW_DIR/lfs 2.130 ;; 2.131 esac 2.132 } 2.133 @@ -196,9 +199,9 @@ 2.134 2.135 case "$COMMAND" in 2.136 on|tank-only|mirror-only) 2.137 - [ -d $WWW_DIR/mirror-info ] && WWW="${WWW/mirror /}" 2.138 + [ -d $MAIN_WWW_DIR/mirror-info ] && WWW="${WWW/mirror /}" 2.139 for c in $WWW; do 2.140 - if [ ! -d $WWW_DIR/$c ]; then 2.141 + if [ ! -d $MAIN_WWW_DIR/$c ]; then 2.142 www $c 2.143 [ "$c" = "hg" ] && repos 2.144 fi 2.145 @@ -225,6 +228,15 @@ 2.146 chown -R www.www /home/slitaz/www 2.147 [ -f /etc/init.d/lighttpd ] && /etc/init.d/lighttpd start 2.148 ;; 2.149 + update-repos) 2.150 + for i in $(ls $REPOS_DIR); do 2.151 + if [ -d $REPOS_DIR/$i/.hg ]; then 2.152 + cd $REPOS_DIR/$i 2.153 + echo "Updaing $i repo..." 2.154 + hg pull -u 2.155 + fi 2.156 + done 2.157 + ;; 2.158 off) 2.159 [ -f /etc/init.d/lighttpd ] && /etc/init.d/lighttpd stop 2.160 echo "127.0.0.1 localhost $(cat /etc/hostname)" > /etc/hosts