From da73e75d64b684bc1d9fde75b024a8dd7ee26528 Mon Sep 17 00:00:00 2001 From: Alain Reguera Delgado Date: Nov 18 2010 15:53:36 +0000 Subject: Update trunk/Scripts/Bash/Functions/Path functionality: - Remove -I option from info and plaintext output. Before output info and plaintext information we moved inside /home/centos/artwork directory which is the base location for paths inside texinfo documentation files. There is no need for info and plaintext output commands to specify the -I options since the command already takes place in the correct location the path information is correctly built on. Nevertheless, the -I option is still required for html output. Once inside /home/centos/artwork we need to move up to html output directory in order to run texi2html output command from inthere. This make texi2html to set relative path to images when html output is generated. Relative path to images under html output directory will fail since there is no image in such location. Instead, a different absolute location is used. So we need to build that absolute path in order for images can be shown as we expect. So this why we still need to use the -I option. We use the -I option to append the location /home/centos/artwork to texi2html search path; and because we use @image{} definition using trunk/ as root location to define images location ... texi2html is able to find the correct path to image, no matter where you execute the centos-art.sh help command. Note that we keep images and documentation output in two different absolute locations. This is intentional. Such configuration let us maintain documentation and images independently one another. --- diff --git a/Scripts/Bash/Functions/Help/help_updateOutputFileInfo.sh b/Scripts/Bash/Functions/Help/help_updateOutputFileInfo.sh index 3fb2517..43f7951 100755 --- a/Scripts/Bash/Functions/Help/help_updateOutputFileInfo.sh +++ b/Scripts/Bash/Functions/Help/help_updateOutputFileInfo.sh @@ -33,8 +33,7 @@ function help_updateOutputFileInfo { [[ ! -d ${MANUALS_DIR[3]} ]] && mkdir -p ${MANUALS_DIR[3]} # Update info file. - /usr/bin/makeinfo ${MANUALS_FILE[1]} --output=${MANUALS_FILE[4]} \ - -I=/home/centos/artwork + /usr/bin/makeinfo ${MANUALS_FILE[1]} --output=${MANUALS_FILE[4]} # Check info file. If the info file was not created then there are # errors to fix. diff --git a/Scripts/Bash/Functions/Help/help_updateOutputFilePlaintext.sh b/Scripts/Bash/Functions/Help/help_updateOutputFilePlaintext.sh index 86a056f..b6bdb1b 100755 --- a/Scripts/Bash/Functions/Help/help_updateOutputFilePlaintext.sh +++ b/Scripts/Bash/Functions/Help/help_updateOutputFilePlaintext.sh @@ -34,7 +34,6 @@ function help_updateOutputFilePlaintext { # Update plaintext output directory. /usr/bin/makeinfo ${MANUALS_FILE[1]} --output=${MANUALS_FILE[5]} \ - --plaintext \ - -I=/home/centos/artwork + --plaintext }