Author: tchemit Date: 2014-12-22 08:22:43 +0000 (Mon, 22 Dec 2014) New Revision: 118 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/118 Log: refs #4057: - ajout de plus de logs - ne rien faire si on ne trouve pas le dossier de site - ?\195?\169chapper le nom de la version (elle peut contenir des espaces) - utiliser le script pour les projets de la forge codelutin.com Modified: scripts/redmine-tools/cron-redmine scripts/redmine-tools/project-technical-site.rb scripts/redmine-tools/update_technical_site.sh Modified: scripts/redmine-tools/cron-redmine =================================================================== --- scripts/redmine-tools/cron-redmine 2014-12-08 19:49:24 UTC (rev 117) +++ scripts/redmine-tools/cron-redmine 2014-12-22 08:22:43 UTC (rev 118) @@ -72,5 +72,5 @@ # TODO Do it for chorem.org and codelutin.com sites ruby /opt/redmine-tools/project-technical-site.rb -f nuiton.org -k $nuiton_key >> $nuiton_log -#ruby /opt/redmine-tools/project-technical-site.rb -f chorem.org -k $chorem_key >> $chorem_log -#ruby /opt/redmine-tools/project-technical-site.rb -f codelutin.com -k $codelutin_key >> codelutin_log +ruby /opt/redmine-tools/project-technical-site.rb -f chorem.org -k $chorem_key >> $chorem_log +ruby /opt/redmine-tools/project-technical-site.rb -f codelutin.com -k $codelutin_key >> codelutin_log Modified: scripts/redmine-tools/project-technical-site.rb =================================================================== --- scripts/redmine-tools/project-technical-site.rb 2014-12-08 19:49:24 UTC (rev 117) +++ scripts/redmine-tools/project-technical-site.rb 2014-12-22 08:22:43 UTC (rev 118) @@ -119,11 +119,11 @@ log("retrieved #{projects.size} projects", :level => 1) def update_technical_site(forge, projectId) - - log("will update technical site of #{projectId}.#{forge}") + log("======================================================================================") + log("Update technical site of #{projectId}.#{forge}") cmd = "/opt/redmine-tools/update_technical_site.sh #{forge} #{projectId}" system(cmd) - + end projects.each do |project| Modified: scripts/redmine-tools/update_technical_site.sh =================================================================== --- scripts/redmine-tools/update_technical_site.sh 2014-12-08 19:49:24 UTC (rev 117) +++ scripts/redmine-tools/update_technical_site.sh 2014-12-22 08:22:43 UTC (rev 118) @@ -31,7 +31,7 @@ DOC_DIR=/var/lib/doc/maven-site/$FORGE/$PROJECT -if [ ! -d $DOC_DIR/$LAST_VERSION_NAME ]; +if [ ! -d $DOC_DIR/"$LAST_VERSION_NAME" ]; then echo "Skip - Last version technical site not found at $DOC_DIR/$LAST_VERSION_NAME" exit 0 @@ -44,6 +44,11 @@ SITE_DIR=/var/lib/doc/site/$FORGE/$PROJECT +if [ ! -d $SITE_DIR ]; then + echo "Skip - No site directory found at $SITE_DIR" + exit 0 +fi + INDEX_FILE=$SITE_DIR/index.html INDEX_FILE2=/tmp/$FORGE-$PROJECT-index.html rm -rf $INDEX_FILE2