From 6d7864dbabdd8bb4de9c95e972e1ae64cab526f1 Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Mon, 16 Apr 2012 16:01:02 +0400 Subject: [PATCH] Split source to code and configs --- chiliproject_doxygen.sh | 14 +++++++------- etc/chiliproject_doxygen | 7 +++++++ etc/rhodecode_chiliproject | 9 +++++++++ rhodecode_chiliproject.sh | 10 +++------- 4 files changed, 26 insertions(+), 14 deletions(-) create mode 100755 etc/chiliproject_doxygen create mode 100755 etc/rhodecode_chiliproject diff --git a/chiliproject_doxygen.sh b/chiliproject_doxygen.sh index 0e8a8b3..3819047 100755 --- a/chiliproject_doxygen.sh +++ b/chiliproject_doxygen.sh @@ -1,8 +1,8 @@ #!/bin/bash -#VARS -DOC_PATH=/var/doc/redmine -TMP_PATH=/tmp/redmine-doxygen$RANDOM$RANDOM +# load config files +[ -f /etc/chiliproject_doxygen ] && source /etc/chiliproject_doxygen +[ -f ~/etc/chiliproject_doxygen ] && source ~/etc/chiliproject_doxygen # table project_id= @@ -14,8 +14,8 @@ identifier= # UMASK umask 0002 -# read redmine.repositories to table -MYSQL_RESULT=`mysql -h127.0.0.1 -u redmine -e "SELECT project_id, type, root_url FROM redmine.repositories" | grep -v tables_col|xargs|sed "s/ /\n/g"|tail -n+4` +# read $MYSQL_DBNAME.repositories to table +MYSQL_RESULT=`mysql -h127.0.0.1 -u $MYSQL_USER -e "SELECT project_id, type, root_url FROM $MYSQL_DBNAME.repositories" | grep -v tables_col|xargs|sed "s/ /\n/g"|tail -n+4` let n=0 for v in $MYSQL_RESULT; do let idx=n/3 @@ -28,8 +28,8 @@ for v in $MYSQL_RESULT; do done; let n/=3 -# read redmine.projects to table -MYSQL_RESULT=`mysql -h127.0.0.1 -u redmine -e "SELECT id, identifier FROM redmine.projects" | grep -v tables_col|xargs|sed "s/ /\n/g"|tail -n+3` +# read $MYSQL_DBNAME.projects to table +MYSQL_RESULT=`mysql -h127.0.0.1 -u $MYSQL_USER -e "SELECT id, identifier FROM $MYSQL_DBNAME.projects" | grep -v tables_col|xargs|sed "s/ /\n/g"|tail -n+3` last_idx=0 let i=0 for v in $MYSQL_RESULT; do diff --git a/etc/chiliproject_doxygen b/etc/chiliproject_doxygen new file mode 100755 index 0000000..3c13598 --- /dev/null +++ b/etc/chiliproject_doxygen @@ -0,0 +1,7 @@ +#!/bin/bash +# + +DOC_PATH=/var/doc/chiliproject +TMP_PATH=/tmp/chiliproject-doxygen$RANDOM$RANDOM +MYSQL_USER=chiliproject +MYSQL_DBNAME=chiliproject diff --git a/etc/rhodecode_chiliproject b/etc/rhodecode_chiliproject new file mode 100755 index 0000000..2fd2cdb --- /dev/null +++ b/etc/rhodecode_chiliproject @@ -0,0 +1,9 @@ +#!/bin/bash +# + +export LANG=ru_RU.UTF-8 +RHODECODE_SQLITE_PATH=/home/rhodecode/rhodecode/rhodecode.db +CHILI_MYSQL_USER=redmine +CHILI_MYSQL_DBNAME=redmine +CHILI_MYSQL_HOSTNAME=127.0.0.1 +CHILI_REQUIRED_ROLES="Ответственный Менеджер Major Manager" diff --git a/rhodecode_chiliproject.sh b/rhodecode_chiliproject.sh index d1693fb..ff01db3 100755 --- a/rhodecode_chiliproject.sh +++ b/rhodecode_chiliproject.sh @@ -1,12 +1,8 @@ #!/bin/bash -# VARS -export LANG=ru_RU.UTF-8 -RHODECODE_SQLITE_PATH=/home/rhodecode/rhodecode/rhodecode.db -CHILI_MYSQL_USER=redmine -CHILI_MYSQL_DBNAME=redmine -CHILI_MYSQL_HOSTNAME=127.0.0.1 -CHILI_REQUIRED_ROLES="Ответственный Менеджер Major Manager" +# load config files +[ -f /etc/rhodecode_chiliproject ] && source /etc/rhodecode_chiliproject +[ -f ~/etc/rhodecode_chiliproject ] && source ~/etc/rhodecode_chiliproject # === REMOVE ALL BROKEN REPOSITORY LINKS IN REDMINE MYSQL DATABASE === ALL_MYSQL_REPOS=`mysql -h$CHILI_MYSQL_HOSTNAME -u $CHILI_MYSQL_USER -e "SELECT url,root_url,id FROM $CHILI_MYSQL_DBNAME.repositories WHERE type='Mercurial' OR type='Repository::Mercurial'" | grep -v tables_col|xargs|sed "s/ /\n/g"|tail -n+4`