diff options
| author | ramon <ramongomez@us.es> | 2010-03-16 15:25:31 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2010-03-16 15:25:31 +0000 |
| commit | ead38fbabcc5b9f61fc40d6b7483f7761f346a4f (patch) | |
| tree | e949a7acf2a165eb51f3d4ebfbb54920b09462af /installer | |
| parent | 311532f10871136683fd5d9fa3f60c078d7238ea (diff) | |
Mensajes y errores para gestión de caché; incluir versión por defecto al generar documentación Doxygen.
git-svn-id: https://opengnsys.es/svn/trunk@812 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'installer')
| -rwxr-xr-x | installer/ogGenerateDoc.sh | 6 | ||||
| -rwxr-xr-x | installer/opengnsys_installer.sh | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/installer/ogGenerateDoc.sh b/installer/ogGenerateDoc.sh index 7ed7d868..d8567d50 100755 --- a/installer/ogGenerateDoc.sh +++ b/installer/ogGenerateDoc.sh @@ -19,7 +19,9 @@ then fi if [ $# = 2 ] then -mkdir -p $2 +mkdir -p "$2" +VERSION=$(cat $(dirname "$0")/../doc/VERSION.txt) 2>/dev/null +VERSION=${VERSION:-"1.0 beta"} cat > /tmp/doxyfile << EOF # Doxyfile 1.5.6 # Fichero para documentar codigo shellscripts linux. @@ -29,7 +31,7 @@ cat > /tmp/doxyfile << EOF #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = "Proyecto OpenGnSys" -PROJECT_NUMBER = 1.0 +PROJECT_NUMBER = $VERSION OUTPUT_DIRECTORY = $2 CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = Spanish diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh index 7f193f5b..d0ff067a 100755 --- a/installer/opengnsys_installer.sh +++ b/installer/opengnsys_installer.sh @@ -753,7 +753,7 @@ function makeDoxygenFiles() $WORKDIR/opengnsys/client/engine $INSTALL_TARGET/www if [ ! -d "$INSTALL_TARGET/www/html" ]; then errorAndLog "${FUNCNAME}(): unable to create Doxygen web files." - return 1 + return 1 fi mv "$INSTALL_TARGET/www/html" "$INSTALL_TARGET/www/api" chown -R $APACHE_RUN_USER:$APACHE_RUN_GROUP $INSTALL_TARGET/www/api |