[Qsos-commits] qsos/tools/update_sheet qsos.cfg update_sheet.sh

[Goneri Le Bouder]

CVSROOT:        /sources/qsos
Module name:    qsos
Changes by:     Goneri Le Bouder <goneri>       07/01/29 12:47:39

Modified files:
        tools/update_sheet: qsos.cfg update_sheet.sh 

Log message:
        fix the local installation of the created sheets.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qsos/tools/update_sheet/qsos.cfg?cvsroot=qsos&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/qsos/tools/update_sheet/update_sheet.sh?cvsroot=qsos&r1=1.10&r2=1.11

Patches:
Index: qsos.cfg
===================================================================
RCS file: /sources/qsos/qsos/tools/update_sheet/qsos.cfg,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- qsos.cfg    24 Oct 2006 16:29:13 -0000      1.7
+++ qsos.cfg    29 Jan 2007 12:47:39 -0000      1.8
@@ -7,20 +7,19 @@
 
 INCLUDE_DIR=`pwd`"/../../sheet/include/"
 HTMLTEMPLATES_DIR=`pwd`/"templates"
-DESTDIR_SHEETS="/tmp/sheets"
-DESTDIR_TEMPLATES="/tmp/template"
+DESTDIR_SHEETS="/home/goneri/public_html/qsos/sheets"
+DESTDIR_TEMPLATES="/home/goneri/public_html/qsos/template"
 
 FTP_UPLOAD="no"
 FTP_LOGIN="login"
-FTP_PASSWD="passwd"
+FTP_PASSWD="password"
 FTP_HOST="ftp"
 FTP_DIR_SHEETS="sheets"
 FTP_DIR_TEMPLATES="templates"
 
 LOCAL_DEPLOY="no"
-LOCAL_DIR="/opt/products/qsos.org/"
-LOCAL_DIR_SHEETS="sheets"
-LOCAL_DIR_TEMPLATES=$LOCAL_DIR_SHEETS/"templates"
+LOCAL_DIR_SHEETS="/opt/products/qsos.org/sheets"
+LOCAL_DIR_TEMPLATES=$/opt/products/qsos.org/templates"
 
 CSS_LISTING="/style/original/qsos-listing.css"
 CSS_SHEET="/style/original/qsos-sheet.css"

Index: update_sheet.sh
===================================================================
RCS file: /sources/qsos/qsos/tools/update_sheet/update_sheet.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- update_sheet.sh     24 Oct 2006 16:29:13 -0000      1.10
+++ update_sheet.sh     29 Jan 2007 12:47:39 -0000      1.11
@@ -1,4 +1,4 @@
-#$Id: update_sheet.sh,v 1.10 2006/10/24 16:29:13 rsemeteys Exp $
+#$Id: update_sheet.sh,v 1.11 2007/01/29 12:47:39 goneri Exp $
 #  Copyright (C) 2006 Atos Origin 
 #
 #  Author: Gonéri Le Bouder <address@hidden>
@@ -112,13 +112,17 @@
 }
 
 deploy_local () {
-cd $LOCAL_DIR
-rm -Rf $LOCAL_DIR_SHEETS $LOCAL_DIR_TEMPLATES
-cp -Rf $DESTDIR_SHEETS $LOCAL_DIR_SHEETS
-cp -Rf $DESTDIR_TEMPLATES $LOCAL_DIR_TEMPLATES
+rm -rf $LOCAL_DIR_SHEETS
+rm -rf $LOCAL_DIR_TEMPLATES
+mkdir -p $LOCAL_DIR_SHEETS
+mkdir -p $LOCAL_DIR_TEMPLATES
+cp -rv $DESTDIR_SHEETS/* $LOCAL_DIR_SHEETS
+cp -rv $DESTDIR_TEMPLATES/* $LOCAL_DIR_TEMPLATES
 }
 
+
 LOCALDIR=`pwd`
+rm -Rf $CVS_LOCAL_DIR $DESTDIR_SHEETS $DESTDIR_TEMPLATES 
 mkdir -p $CVS_LOCAL_DIR
 mkdir -p $DESTDIR_SHEETS