[Pkg-octave-commit] rev 744 - trunk/www

[Rafael Laboissiere]

Author: rafael
Date: 2006-09-12 07:49:42 +0000 (Tue, 12 Sep 2006)
New Revision: 744

Modified:
   trunk/www/Makefile
Log:
Much simpler installation rules:
  * No tarball is gnerated/uploaded/decompressed, because we are using a pipe
    through ssh now
  * Changing group permissions is done through umask and sg
  * No use of USER variable.  People should use User/Host in their
    ~/.ssh/config files.


Modified: trunk/www/Makefile
===================================================================
--- trunk/www/Makefile	2006-09-07 20:56:32 UTC (rev 743)
+++ trunk/www/Makefile	2006-09-12 07:49:42 UTC (rev 744)
@@ -1,12 +1,8 @@
 # Makefile for installing the D.O.G. project home page at Alioth
 #
-# Use it as:
-#   make USER=your-alioth-username
-#
 # Written by Rafael Laboissiere <rafael at debian.org>
 # $Id$
 
-USER = $(shell whoami)
 GROUP = pkg-octave
 HOST = alioth.debian.org
 DIR = /org/alioth.debian.org/chroot/home/groups/pkg-octave/htdocs/
@@ -14,23 +10,12 @@
 CSS = dog.css guidelines.css common.css
 INSTALLFILES = index.html DOG-Guidelines.html DOG-Guidelines.txt \
   $(ICONS) $(CSS)
-TARBALL = tmp.tgz
 
-install: svn-ci $(TARBALL)
-	@echo -n "Uploading tarball to web site... "
-	@scp -q $(TARBALL) $(USER)@$(HOST):$(DIR)
+install: svn-ci
+	@echo -n "Installing the web site... "
+	@tar c --mode 664 $(INSTALLFILES) | \
+	  ssh $(HOST) 'cd $(DIR); umask 12; sg $(GROUP) -c "tar x"'
 	@echo done
-	@echo -n "Installing remote tarball... "
-	@ssh $(USER)@$(HOST) 'cd $(DIR); tar xfz $(TARBALL)'
-	@echo done
-	@echo -n "Setting group access of www files... "
-	- at ssh $(USER)@$(HOST)						\
-		'cd $(DIR); chgrp -R $(GROUP) .; chmod -R g=u .'	\
-		> /dev/null 2>&1
-	@echo done
-	@echo -n "Removing remote tarball... "
-	@ssh $(USER)@$(HOST) rm -f $(DIR)$(TARBALL)
-	@echo done
 
 %.html: %.html.in
 	eperl $< > $@
@@ -38,11 +23,6 @@
 %.html: %.txt
 	rest2html --no-toc-backlinks --stylesheet=guidelines.css $< $@
 
-$(TARBALL): $(INSTALLFILES)
-	@echo -n "Making tarball... "
-	@tar cfz $(TARBALL) $(INSTALLFILES)
-	@echo done
-
 svn-ci:
 	svn ci
 	svn up