diff --git a/Dockerfile b/Dockerfile index d9a414e..feb29c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,12 +35,12 @@ RUN rm -Rf v1.0.zip sh_util-1.0 RUN mkdir /sh_tool/ COPY sh_tool /sh_tool/ RUN find /sh_tool/ -name "*.editorconfig" -type f -exec rm -Rf {} \; -RUN mkdir -p /root/scripts/gen_man/ver.3.0/ +RUN mkdir -p /root/scripts/gen_man/ver.4.0/ RUN mkdir /root/bin/ -RUN cp -R /sh_tool/bin/ /root/scripts/gen_man/ver.3.0/ -RUN cp -R /sh_tool/conf/ /root/scripts/gen_man/ver.3.0/ -RUN cp -R /sh_tool/log/ /root/scripts/gen_man/ver.3.0/ +RUN cp -R /sh_tool/bin/ /root/scripts/gen_man/ver.4.0/ +RUN cp -R /sh_tool/conf/ /root/scripts/gen_man/ver.4.0/ +RUN cp -R /sh_tool/log/ /root/scripts/gen_man/ver.4.0/ RUN rm -Rf /sh_tool/ -RUN chmod -R 755 /root/scripts/gen_man/ver.3.0/ -RUN ln -s /root/scripts/gen_man/ver.3.0/bin/gen_man.sh /root/bin/gen_man -RUN tree /root/scripts/gen_man/ver.3.0/ +RUN chmod -R 755 /root/scripts/gen_man/ver.4.0/ +RUN ln -s /root/scripts/gen_man/ver.4.0/bin/gen_man.sh /root/bin/gen_man +RUN tree /root/scripts/gen_man/ver.4.0/ diff --git a/README.md b/README.md index f704d59..63a3e68 100644 --- a/README.md +++ b/README.md @@ -34,11 +34,11 @@ Navigate to release **[page](https://github.com/vroncevic/gen_man/releases)** do To install **gen_man** type the following: ```bash -tar xvzf gen_man-3.0.tar.gz -cd gen_man-3.0 -cp -R ~/sh_tool/bin/ /root/scripts/gen_man/ver.3.0/ -cp -R ~/sh_tool/conf/ /root/scripts/gen_man/ver.3.0/ -cp -R ~/sh_tool/log/ /root/scripts/gen_man/ver.3.0/ +tar xvzf gen_man-4.0.tar.gz +cd gen_man-4.0 +cp -R ~/sh_tool/bin/ /root/scripts/gen_man/ver.4.0/ +cp -R ~/sh_tool/conf/ /root/scripts/gen_man/ver.4.0/ +cp -R ~/sh_tool/log/ /root/scripts/gen_man/ver.4.0/ ```  @@ -49,7 +49,7 @@ Or You can use docker to create image/container. ```bash # Create symlink for shell tool -ln -s /root/scripts/gen_man/ver.3.0/bin/gen_man.sh /root/bin/gen_man +ln -s /root/scripts/gen_man/ver.4.0/bin/gen_man.sh /root/bin/gen_man # Setting PATH export PATH=${PATH}:/root/bin/ @@ -95,7 +95,7 @@ More documentation and info at: ### Copyright and licence -[](https://www.gnu.org/licenses/gpl-3.0) [](https://opensource.org/licenses/Apache-2.0) +[](https://www.gnu.org/licenses/gpl-4.0) [](https://opensource.org/licenses/Apache-2.0) Copyright (C) 2017 - 2026 by [vroncevic.github.io/gen_man](https://vroncevic.github.io/gen_man) diff --git a/docs/build/doctrees/environment.pickle b/docs/build/doctrees/environment.pickle index e41dd37..b2fd103 100644 Binary files a/docs/build/doctrees/environment.pickle and b/docs/build/doctrees/environment.pickle differ diff --git a/docs/build/doctrees/index.doctree b/docs/build/doctrees/index.doctree index 391628d..779facb 100644 Binary files a/docs/build/doctrees/index.doctree and b/docs/build/doctrees/index.doctree differ diff --git a/docs/build/html/_sources/index.rst.txt b/docs/build/html/_sources/index.rst.txt index dda9c67..f277a2f 100644 --- a/docs/build/html/_sources/index.rst.txt +++ b/docs/build/html/_sources/index.rst.txt @@ -41,11 +41,11 @@ To install **gen_man** type the following: .. code-block:: bash - tar xvzf gen_man-3.0.tar.gz - cd gen_man-3.0 - cp -R ~/sh_tool/bin/ /root/scripts/gen_man/ver.3.0/ - cp -R ~/sh_tool/conf/ /root/scripts/gen_man/ver.3.0/ - cp -R ~/sh_tool/log/ /root/scripts/gen_man/ver.3.0/ + tar xvzf gen_man-4.0.tar.gz + cd gen_man-4.0 + cp -R ~/sh_tool/bin/ /root/scripts/gen_man/ver.4.0/ + cp -R ~/sh_tool/conf/ /root/scripts/gen_man/ver.4.0/ + cp -R ~/sh_tool/log/ /root/scripts/gen_man/ver.4.0/ Or You can use Docker to create image/container. @@ -84,7 +84,7 @@ Copyright and licence |License: GPL v3| |License: Apache 2.0| .. |License: GPL v3| image:: https://img.shields.io/badge/License-GPLv3-blue.svg - :target: https://www.gnu.org/licenses/gpl-3.0 + :target: https://www.gnu.org/licenses/gpl-4.0 .. |License: Apache 2.0| image:: https://img.shields.io/badge/License-Apache%202.0-blue.svg :target: https://opensource.org/licenses/Apache-2.0 diff --git a/docs/build/html/index.html b/docs/build/html/index.html index f1ea08e..264fdee 100644 --- a/docs/build/html/index.html +++ b/docs/build/html/index.html @@ -48,11 +48,11 @@
Navigate to release page download and extract release archive.
To install gen_man type the following:
-tar xvzf gen_man-3.0.tar.gz
-cd gen_man-3.0
-cp -R ~/sh_tool/bin/ /root/scripts/gen_man/ver.3.0/
-cp -R ~/sh_tool/conf/ /root/scripts/gen_man/ver.3.0/
-cp -R ~/sh_tool/log/ /root/scripts/gen_man/ver.3.0/
+tar xvzf gen_man-4.0.tar.gz
+cd gen_man-4.0
+cp -R ~/sh_tool/bin/ /root/scripts/gen_man/ver.4.0/
+cp -R ~/sh_tool/conf/ /root/scripts/gen_man/ver.4.0/
+cp -R ~/sh_tool/log/ /root/scripts/gen_man/ver.4.0/
Or You can use Docker to create image/container.
@@ -85,7 +85,7 @@ Shell tool structure
Copyright and licence¶
-
+
Copyright (C) 2017 - 2026 by vroncevic.github.io/gen_man
gen_man is free software; you can redistribute it and/or modify it
under the same terms as Bash itself, either Bash version 4.2.47 or,
diff --git a/docs/build/html/objects.inv b/docs/build/html/objects.inv
index ffcc493..d900012 100644
Binary files a/docs/build/html/objects.inv and b/docs/build/html/objects.inv differ
diff --git a/docs/build/html/searchindex.js b/docs/build/html/searchindex.js
index b57b001..b64e8e1 100644
--- a/docs/build/html/searchindex.js
+++ b/docs/build/html/searchindex.js
@@ -1 +1 @@
-Search.setIndex({"docnames": ["index"], "filenames": ["index.rst"], "titles": ["gen_man"], "terms": {"i": 0, "gener": 0, "man": 0, "page": 0, "develop": 0, "bash": 0, "code": 0, "100": 0, "The": 0, "readm": 0, "us": 0, "introduc": 0, "provid": 0, "instruct": 0, "how": 0, "ani": 0, "machin": 0, "mai": 0, "have": 0, "other": 0, "inform": 0, "should": 0, "befor": 0, "navig": 0, "releas": 0, "download": 0, "extract": 0, "archiv": 0, "To": 0, "type": 0, "follow": 0, "tar": 0, "xvzf": 0, "3": 0, "0": 0, "gz": 0, "cd": 0, "cp": 0, "r": 0, "sh_tool": 0, "bin": 0, "root": 0, "script": 0, "ver": 0, "conf": 0, "log": 0, "Or": 0, "you": 0, "can": 0, "docker": 0, "creat": 0, "imag": 0, "contain": 0, "requir": 0, "next": 0, "modul": 0, "librari": 0, "sh_util": 0, "http": 0, "github": 0, "com": 0, "vroncev": 0, "base": 0, "mop": 0, "create_man": 0, "sh": 0, "install_man": 0, "cfg": 0, "gen_man_util": 0, "templat": 0, "c": 0, "2017": 0, "2026": 0, "io": 0, "free": 0, "softwar": 0, "redistribut": 0, "modifi": 0, "under": 0, "same": 0, "term": 0, "itself": 0, "either": 0, "version": 0, "4": 0, "2": 0, "47": 0, "your": 0, "option": 0, "later": 0, "avail": 0, "let": 0, "help": 0, "support": 0, "fsf": 0, "index": 0, "search": 0}, "objects": {}, "objtypes": {}, "objnames": {}, "titleterms": {"gen_man": 0, "instal": 0, "depend": 0, "shell": 0, "tool": 0, "structur": 0, "copyright": 0, "licenc": 0, "indic": 0, "tabl": 0}, "envversion": {"sphinx.domains.c": 3, "sphinx.domains.changeset": 1, "sphinx.domains.citation": 1, "sphinx.domains.cpp": 9, "sphinx.domains.index": 1, "sphinx.domains.javascript": 3, "sphinx.domains.math": 2, "sphinx.domains.python": 4, "sphinx.domains.rst": 2, "sphinx.domains.std": 2, "sphinx.ext.viewcode": 1, "sphinx": 60}, "alltitles": {"gen_man": [[0, "gen-man"]], "Installation": [[0, "installation"]], "Dependencies": [[0, "dependencies"]], "Shell tool structure": [[0, "shell-tool-structure"]], "Copyright and licence": [[0, "copyright-and-licence"]], "Indices and tables": [[0, "indices-and-tables"]]}, "indexentries": {}})
\ No newline at end of file
+Search.setIndex({"docnames": ["index"], "filenames": ["index.rst"], "titles": ["gen_man"], "terms": {"i": 0, "gener": 0, "man": 0, "page": 0, "develop": 0, "bash": 0, "code": 0, "100": 0, "The": 0, "readm": 0, "us": 0, "introduc": 0, "provid": 0, "instruct": 0, "how": 0, "ani": 0, "machin": 0, "mai": 0, "have": 0, "other": 0, "inform": 0, "should": 0, "befor": 0, "navig": 0, "releas": 0, "download": 0, "extract": 0, "archiv": 0, "To": 0, "type": 0, "follow": 0, "tar": 0, "xvzf": 0, "4": 0, "0": 0, "gz": 0, "cd": 0, "cp": 0, "r": 0, "sh_tool": 0, "bin": 0, "root": 0, "script": 0, "ver": 0, "conf": 0, "log": 0, "Or": 0, "you": 0, "can": 0, "docker": 0, "creat": 0, "imag": 0, "contain": 0, "requir": 0, "next": 0, "modul": 0, "librari": 0, "sh_util": 0, "http": 0, "github": 0, "com": 0, "vroncev": 0, "base": 0, "mop": 0, "create_man": 0, "sh": 0, "install_man": 0, "cfg": 0, "gen_man_util": 0, "templat": 0, "c": 0, "2017": 0, "2026": 0, "io": 0, "free": 0, "softwar": 0, "redistribut": 0, "modifi": 0, "under": 0, "same": 0, "term": 0, "itself": 0, "either": 0, "version": 0, "2": 0, "47": 0, "your": 0, "option": 0, "later": 0, "avail": 0, "let": 0, "help": 0, "support": 0, "fsf": 0, "index": 0, "search": 0}, "objects": {}, "objtypes": {}, "objnames": {}, "titleterms": {"gen_man": 0, "instal": 0, "depend": 0, "shell": 0, "tool": 0, "structur": 0, "copyright": 0, "licenc": 0, "indic": 0, "tabl": 0}, "envversion": {"sphinx.domains.c": 3, "sphinx.domains.changeset": 1, "sphinx.domains.citation": 1, "sphinx.domains.cpp": 9, "sphinx.domains.index": 1, "sphinx.domains.javascript": 3, "sphinx.domains.math": 2, "sphinx.domains.python": 4, "sphinx.domains.rst": 2, "sphinx.domains.std": 2, "sphinx.ext.viewcode": 1, "sphinx": 60}, "alltitles": {"gen_man": [[0, "gen-man"]], "Installation": [[0, "installation"]], "Dependencies": [[0, "dependencies"]], "Shell tool structure": [[0, "shell-tool-structure"]], "Copyright and licence": [[0, "copyright-and-licence"]], "Indices and tables": [[0, "indices-and-tables"]]}, "indexentries": {}})
\ No newline at end of file
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 6434755..9123fb3 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -29,7 +29,7 @@
project: str = 'gen_man'
project_copyright: str = '2026, Vladimir Roncevic '
author: str = 'Vladimir Roncevic '
-version: str = '3.0'
+version: str = '4.0'
release: str = 'https://github.com/vroncevic/gen_man/releases'
extensions: List[str] = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode']
templates_path: List[str] = ['_templates']
diff --git a/docs/source/index.rst b/docs/source/index.rst
index dda9c67..f277a2f 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -41,11 +41,11 @@ To install **gen_man** type the following:
.. code-block:: bash
- tar xvzf gen_man-3.0.tar.gz
- cd gen_man-3.0
- cp -R ~/sh_tool/bin/ /root/scripts/gen_man/ver.3.0/
- cp -R ~/sh_tool/conf/ /root/scripts/gen_man/ver.3.0/
- cp -R ~/sh_tool/log/ /root/scripts/gen_man/ver.3.0/
+ tar xvzf gen_man-4.0.tar.gz
+ cd gen_man-4.0
+ cp -R ~/sh_tool/bin/ /root/scripts/gen_man/ver.4.0/
+ cp -R ~/sh_tool/conf/ /root/scripts/gen_man/ver.4.0/
+ cp -R ~/sh_tool/log/ /root/scripts/gen_man/ver.4.0/
Or You can use Docker to create image/container.
@@ -84,7 +84,7 @@ Copyright and licence
|License: GPL v3| |License: Apache 2.0|
.. |License: GPL v3| image:: https://img.shields.io/badge/License-GPLv3-blue.svg
- :target: https://www.gnu.org/licenses/gpl-3.0
+ :target: https://www.gnu.org/licenses/gpl-4.0
.. |License: Apache 2.0| image:: https://img.shields.io/badge/License-Apache%202.0-blue.svg
:target: https://opensource.org/licenses/Apache-2.0
diff --git a/sh_tool/bin/create_man.sh b/sh_tool/bin/create_man.sh
index 70fc4e2..4982c2e 100755
--- a/sh_tool/bin/create_man.sh
+++ b/sh_tool/bin/create_man.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# @brief Creating Man Page
-# @version ver.3.0
+# @version ver.4.0
# @date Tue Feb 7 08:49:43 CET 2017
# @company None, free software to use 2017
# @author Vladimir Roncevic
@@ -11,11 +11,10 @@ UTIL_VERSION=ver.1.0
UTIL=${UTIL_ROOT}/sh_util/${UTIL_VERSION}
UTIL_LOG=${UTIL}/log
-. ${UTIL}/bin/devel.sh
. ${UTIL}/bin/usage.sh
GEN_MAN_TOOL=gen_man
-GEN_MAN_VERSION=ver.3.0
+GEN_MAN_VERSION=ver.4.0
GEN_MAN_HOME=${UTIL_ROOT}/${GEN_MAN_TOOL}/${GEN_MAN_VERSION}
declare -A GEN_MAN_CREATE_USAGE=(
@@ -51,23 +50,23 @@ declare -A GEN_MAN_CREATE_USAGE=(
function __create_man {
local MFILE=$1 MT=$2 AUTHOR=$3
local FUNC=${FUNCNAME[0]} MSG="None" DATE=`date` ML
- if [[ -n "${MFILE}" && -n "${MT}" && -n "${AUTHOR}" ]]; then
- MSG="Creating man page!"
- info_debug_message "$MSG" "$FUNC" "$GEN_MAN_TOOL"
- local MTF="${GEN_MAN_HOME}/conf/${MT}"
- MSG="Generating file [${MFILE}.1]"
- info_debug_message "$MSG" "$FUNC" "$GEN_MAN_TOOL"
- while read ML
- do
- eval echo "${ML}" >> ${MFILE}.1
- done < ${MTF}
- MSG="Set permission!"
- info_debug_message "$MSG" "$FUNC" "$GEN_MAN_TOOL"
- eval "chmod 755 ${MFILE}.1"
- info_debug_message_end "Done" "$FUNC" "$GEN_MAN_TOOL"
- return $SUCCESS
+ if [[ -z "${MFILE}" || -z "${MT}" || -z "${AUTHOR}" ]]; then
+ usage GEN_MAN_CREATE_USAGE
+ return $NOT_SUCCESS
fi
- usage GEN_MAN_CREATE_USAGE
- return $NOT_SUCCESS
+ MSG="Creating man page!"
+ info_debug_message "$MSG" "$FUNC" "$GEN_MAN_TOOL"
+ local MTF="${GEN_MAN_HOME}/conf/${MT}"
+ MSG="Generating file [${MFILE}.1]"
+ info_debug_message "$MSG" "$FUNC" "$GEN_MAN_TOOL"
+ while read ML
+ do
+ eval echo "${ML}" >> ${MFILE}.1
+ done < ${MTF}
+ MSG="Set permission!"
+ info_debug_message "$MSG" "$FUNC" "$GEN_MAN_TOOL"
+ eval "chmod 755 ${MFILE}.1"
+ info_debug_message_end "Done" "$FUNC" "$GEN_MAN_TOOL"
+ return $SUCCESS
}
diff --git a/sh_tool/bin/gen_man.sh b/sh_tool/bin/gen_man.sh
index 13b2ce6..12ec249 100755
--- a/sh_tool/bin/gen_man.sh
+++ b/sh_tool/bin/gen_man.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# @brief Generate and install man page
-# @version ver.3.0
+# @version ver.4.0
# @date Tue Feb 7 08:49:43 CET 2017
# @company None, free software to use 2017
# @author Vladimir Roncevic
@@ -11,8 +11,6 @@ UTIL_VERSION=ver.1.0
UTIL=${UTIL_ROOT}/sh_util/${UTIL_VERSION}
UTIL_LOG=${UTIL}/log
-. ${UTIL}/bin/devel.sh
-. ${UTIL}/bin/usage.sh
. ${UTIL}/bin/check_root.sh
. ${UTIL}/bin/check_tool.sh
. ${UTIL}/bin/logging.sh
@@ -22,7 +20,7 @@ UTIL_LOG=${UTIL}/log
. ${UTIL}/bin/display_logo.sh
GEN_MAN_TOOL=gen_man
-GEN_MAN_VERSION=ver.3.0
+GEN_MAN_VERSION=ver.4.0
GEN_MAN_HOME=${UTIL_ROOT}/${GEN_MAN_TOOL}/${GEN_MAN_VERSION}
GEN_MAN_CFG=${GEN_MAN_HOME}/conf/${GEN_MAN_TOOL}.cfg
GEN_MAN_UTIL_CFG=${GEN_MAN_HOME}/conf/${GEN_MAN_TOOL}_util.cfg
@@ -53,6 +51,13 @@ declare -A PB_STRUCTURE=(
[SLEEP]=0.01
)
+declare -A GEN_MAN_LOGO_DATA=(
+ [OWNER]="vroncevic"
+ [REPO]="${GEN_MAN_TOOL}"
+ [VERSION]="${GEN_MAN_VERSION}"
+ [LOGO]="${GEN_MAN_LOGO}"
+)
+
TOOL_DBG="false"
TOOL_LOG="false"
TOOL_NOTIFY="false"
@@ -82,69 +87,69 @@ TOOL_NOTIFY="false"
#
function __gen_man {
local OP=$1 MFILE=$2
- if [[ -n "${OP}" && -n "${MFILE}" ]]; then
- display_logo "vroncevic" "${GEN_MAN_TOOL}" "${GEN_MAN_VERSION}" "${GEN_MAN_LOGO}"
- local FUNC=${FUNCNAME[0]} MSG="None"
- local STATUS_CONF STATUS_CONF_UTIL STATUS
- MSG="Loading basic and util configuration!"
- info_debug_message "$MSG" "$FUNC" "$GEN_MAN_TOOL"
- progress_bar PB_STRUCTURE
- declare -A config_gen_man=()
- load_conf "$GEN_MAN_CFG" config_gen_man
- STATUS_CONF=$?
- declare -A config_gen_man_util=()
- load_util_conf "$GEN_MAN_UTIL_CFG" config_gen_man_util
- STATUS_CONF_UTIL=$?
- declare -A STATUS_STRUCTURE=(
- [1]=$STATUS_CONF [2]=$STATUS_CONF_UTIL
- )
- check_status STATUS_STRUCTURE
+ if [[ -z "${OP}" || -z "${MFILE}" ]]; then
+ usage GEN_MAN_USAGE
+ exit 128
+ fi
+ display_logo GEN_MAN_LOGO_DATA
+ local FUNC=${FUNCNAME[0]} MSG="None"
+ local STATUS_CONF STATUS_CONF_UTIL STATUS
+ MSG="Loading basic and util configuration!"
+ info_debug_message "$MSG" "$FUNC" "$GEN_MAN_TOOL"
+ progress_bar PB_STRUCTURE
+ declare -A config_gen_man=()
+ load_conf "$GEN_MAN_CFG" config_gen_man
+ STATUS_CONF=$?
+ declare -A config_gen_man_util=()
+ load_util_conf "$GEN_MAN_UTIL_CFG" config_gen_man_util
+ STATUS_CONF_UTIL=$?
+ declare -A STATUS_STRUCTURE=(
+ [1]=$STATUS_CONF [2]=$STATUS_CONF_UTIL
+ )
+ check_status STATUS_STRUCTURE
+ STATUS=$?
+ if [ $STATUS -eq $NOT_SUCCESS ]; then
+ MSG="Force exit!"
+ info_debug_message_end "$MSG" "$FUNC" "$GEN_MAN_TOOL"
+ exit 129
+ fi
+ TOOL_LOG=${config_gen_man[LOGGING]}
+ TOOL_DBG=${config_gen_man[DEBUGGING]}
+ TOOL_NOTIFY=${config_gen_man[EMAILING]}
+ if [ "${OP}" == "create" ]; then
+ local MAN_PAGE=${config_gen_man_util[MAN_PAGE]}
+ local AUTHOR=${config_gen_man_util[AUTHOR]}
+ __create_man ${MFILE} ${MAN_PAGE} ${AUTHOR}
STATUS=$?
if [ $STATUS -eq $NOT_SUCCESS ]; then
MSG="Force exit!"
info_debug_message_end "$MSG" "$FUNC" "$GEN_MAN_TOOL"
- exit 129
+ exit 130
fi
- TOOL_LOG=${config_gen_man[LOGGING]}
- TOOL_DBG=${config_gen_man[DEBUGGING]}
- TOOL_NOTIFY=${config_gen_man[EMAILING]}
- if [ "${OP}" == "create" ]; then
- local MAN_PAGE=${config_gen_man_util[MAN_PAGE]}
- local AUTHOR=${config_gen_man_util[AUTHOR]}
- __create_man ${MFILE} ${MAN_PAGE} ${AUTHOR}
- STATUS=$?
- if [ $STATUS -eq $NOT_SUCCESS ]; then
- MSG="Force exit!"
- info_debug_message_end "$MSG" "$FUNC" "$GEN_MAN_TOOL"
- exit 130
- fi
- MSG="Created MAN Page: ${MFILE}.1"
- GEN_MAN_LOGGING[LOG_MSGE]=$MSG
- logging GEN_MAN_LOGGING
- elif [ "${OP}" == "install" ]; then
- local INSTALL=${config_gen_man_util[INSTALL]}
- local HPAGES=${config_gen_man_util[MAN_HOME_PAGES]}
- __install_man ${MFILE} ${INSTALL} ${HPAGES}
- STATUS=$?
- if [ $STATUS -eq $NOT_SUCCESS ]; then
- MSG="Force exit!"
- info_debug_message_end "$MSG" "$FUNC" "$GEN_MAN_TOOL"
- exit 131
- fi
- MSG="Installed MAN Page: ${MFILE}.1"
- GEN_MAN_LOGGING[LOG_MSGE]=$MSG
- logging GEN_MAN_LOGGING
- else
- MSG="Not supported option [${OP}]"
- info_debug_message "$MSG" "$FUNC" "$GEN_MAN_TOOL"
+ MSG="Created MAN Page: ${MFILE}.1"
+ GEN_MAN_LOGGING[LOG_MSGE]=$MSG
+ logging GEN_MAN_LOGGING
+ elif [ "${OP}" == "install" ]; then
+ local INSTALL=${config_gen_man_util[INSTALL]}
+ local HPAGES=${config_gen_man_util[MAN_HOME_PAGES]}
+ __install_man ${MFILE} ${INSTALL} ${HPAGES}
+ STATUS=$?
+ if [ $STATUS -eq $NOT_SUCCESS ]; then
MSG="Force exit!"
info_debug_message_end "$MSG" "$FUNC" "$GEN_MAN_TOOL"
- exit 132
+ exit 131
fi
- exit 0
+ MSG="Installed MAN Page: ${MFILE}.1"
+ GEN_MAN_LOGGING[LOG_MSGE]=$MSG
+ logging GEN_MAN_LOGGING
+ else
+ MSG="Not supported option [${OP}]"
+ info_debug_message "$MSG" "$FUNC" "$GEN_MAN_TOOL"
+ MSG="Force exit!"
+ info_debug_message_end "$MSG" "$FUNC" "$GEN_MAN_TOOL"
+ exit 132
fi
- usage GEN_MAN_USAGE
- exit 128
+ exit 0
}
#
diff --git a/sh_tool/bin/install_man.sh b/sh_tool/bin/install_man.sh
index 70b2807..fdea036 100755
--- a/sh_tool/bin/install_man.sh
+++ b/sh_tool/bin/install_man.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# @brief Install Man Page
-# @version ver.3.0
+# @version ver.4.0
# @date Tue Feb 7 08:49:43 CET 2017
# @company None, free software to use 2017
# @author Vladimir Roncevic
@@ -11,8 +11,6 @@ UTIL_VERSION=ver.1.0
UTIL=${UTIL_ROOT}/sh_util/${UTIL_VERSION}
UTIL_LOG=${UTIL}/log
-. ${UTIL}/bin/devel.sh
-. ${UTIL}/bin/usage.sh
. ${UTIL}/bin/check_tool.sh
GEN_MAN_TOOL=gen_man
@@ -46,37 +44,37 @@ declare -A GEN_MAN_INSTALL_USAGE=(
function __install_man {
local MFILE=$1 INSTALL=$2 HPAGES=$3
local FUNC=${FUNCNAME[0]} MSG="None" STATUS
- if [[ -n "${MFILE}" && -n "${INSTALL}" && -n "${HPAGES}" ]]; then
- MSG="Installing man page!"
+ if [[ -z "${MFILE}" || -z "${INSTALL}" || -z "${HPAGES}" ]]; then
+ usage GEN_MAN_INSTALL_USAGE
+ return $NOT_SUCCESS
+ fi
+ MSG="Installing man page!"
+ info_debug_message "$MSG" "$FUNC" "$GEN_MAN_TOOL"
+ if [ ! -e "${MFILE}" ]; then
+ MSG="Check file [${MFILE}]"
info_debug_message "$MSG" "$FUNC" "$GEN_MAN_TOOL"
- if [ ! -e "${MFILE}" ]; then
- MSG="Check file [${MFILE}]"
- info_debug_message "$MSG" "$FUNC" "$GEN_MAN_TOOL"
- MSG="Force exit!"
- info_debug_message_end "$MSG" "$FUNC" "$GEN_MAN_TOOL"
- return $NOT_SUCCESS
- fi
- if [ -d "${HPAGES}/" ]; then
- check_tool "${INSTALL}"
- STATUS=$?
- if [ $STATUS -eq $SUCCESS ]; then
- eval "${INSTALL} -g 0 -o 0 -m 0644 ${MFILE} ${HPAGES}/"
- gzip "${HPAGES}/${MFILE}"
- info_debug_message_end "Done" "$FUNC" "$GEN_MAN_TOOL"
- return $SUCCESS
- fi
- cp ${MFILE} "${HPAGES}/${MFILE}"
+ MSG="Force exit!"
+ info_debug_message_end "$MSG" "$FUNC" "$GEN_MAN_TOOL"
+ return $NOT_SUCCESS
+ fi
+ if [ -d "${HPAGES}/" ]; then
+ check_tool "${INSTALL}"
+ STATUS=$?
+ if [ $STATUS -eq $SUCCESS ]; then
+ eval "${INSTALL} -g 0 -o 0 -m 0644 ${MFILE} ${HPAGES}/"
gzip "${HPAGES}/${MFILE}"
info_debug_message_end "Done" "$FUNC" "$GEN_MAN_TOOL"
return $SUCCESS
fi
- MSG="Check directory [${HPAGES}/]"
- info_debug_message "$MSG" "$FUNC" "$GEN_MAN_TOOL"
- MSG="Force exit!"
- info_debug_message_end "$MSG" "$FUNC" "$GEN_MAN_TOOL"
- return $NOT_SUCCESS
+ cp ${MFILE} "${HPAGES}/${MFILE}"
+ gzip "${HPAGES}/${MFILE}"
+ info_debug_message_end "Done" "$FUNC" "$GEN_MAN_TOOL"
+ return $SUCCESS
fi
- usage GEN_MAN_INSTALL_USAGE
+ MSG="Check directory [${HPAGES}/]"
+ info_debug_message "$MSG" "$FUNC" "$GEN_MAN_TOOL"
+ MSG="Force exit!"
+ info_debug_message_end "$MSG" "$FUNC" "$GEN_MAN_TOOL"
return $NOT_SUCCESS
}