From 9815cac93139ec0a4a155934819a887b6436081a Mon Sep 17 00:00:00 2001
From: "Ramón M. Gómez" <ramongomez@us.es>
Date: Tue, 12 Jun 2018 13:08:52 +0200
Subject: #843: Scripts in in^Caller directory use new version file.

---
 installer/ogGenerateDoc.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'installer/ogGenerateDoc.sh')

diff --git a/installer/ogGenerateDoc.sh b/installer/ogGenerateDoc.sh
index 34a16ced..62839ef2 100755
--- a/installer/ogGenerateDoc.sh
+++ b/installer/ogGenerateDoc.sh
@@ -20,8 +20,10 @@ fi
 if [ $# = 2 ]
 then
 mkdir -p "$2"
-VERSION=$(cat $(dirname "$0")/../doc/VERSION.txt) 2>/dev/null
-VERSION=${VERSION:-"1.1"}
+PROJECT=$(jq '.project' $(dirname "$0")/../doc/VERSION.json) 2>/dev/null
+PROJECT=${PROJECT:-"OpenGnsys"}
+VERSION=$(jq '.version+" "+.codename' $(dirname "$0")/../doc/VERSION.json) 2>/dev/null
+VERSION=${VERSION:-"1.1.1"}
 cat > /tmp/doxyfile << EOF
 # Doxyfile 1.5.6
 # Fichero para documentar codigo shellscripts linux.
@@ -30,7 +32,7 @@ cat > /tmp/doxyfile << EOF
 # Project related configuration options
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
-PROJECT_NAME           = "Proyecto OpenGnsys"
+PROJECT_NAME           = $PROJECT
 PROJECT_NUMBER         = $VERSION
 OUTPUT_DIRECTORY       = $2
 PROJECT_LOGO           = $(dirname "$0")/../doc/opengnsys-logo.png
-- 
cgit v1.2.3-18-g5258