shortened build script and other fixes

bareos · Nov 24, 2018 · 209f8b4 · 209f8b4
1 parent a0b3460
commit 209f8b4
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 186 deletions.
diff --git a/docs/manuals/en/new_main_reference/replace.sh b/docs/manuals/en/new_main_reference/replace.sh
@@ -64,9 +64,15 @@ sed -i 's#:raw-latex:`\\yeno`#yes\\|no#g' *.rst
 # General
 #
 
-sed -i 's|:raw-latex:`\\command{bconsole}`|:command:`bconsole`|g' *.rst
-sed -i -E 's|:raw-latex:`\\command\{(.*)\}`|:command:`\1`|g' *.rst
-sed -i -E 's|:raw-latex:`\\bcommand\{(.*)\}\{(.*)\}`|:command:`\1 \2`|g' *.rst
+#sed -i 's|:raw-latex:`\\command{bconsole}`|:command:`bconsole`|g' *.rst
+
+#sed -i   -E 's|:raw-latex:`\\command\{(.*)\}`|:command:`\1`|g' *.rst
+perl -i  -pe 's#:raw-latex:`\\command\{(.*?)\}`#:command:`\1`#g' *.rst
+perl -i  -pe 's#:raw-latex:`\\bcommand\{(.*?)\}\{(.*?)\}`#:command:`\1 \2`#g' *.rst
+
+
+
+#sed -i -E 's|:raw-latex:`\\bcommand\{(.*)\}\{(.*)\}`|:command:`\1 \2`|g' *.rst
 
 sed -i -E 's|:raw-latex:`\\file\{(.*)\}`|*\1*|g' *.rst
 sed -i -E 's|:raw-latex:`\\directory\{(.*)\}`|*\1*|g' *.rst

diff --git a/docs/manuals/en/new_main_reference/source/recycling.rst b/docs/manuals/en/new_main_reference/source/recycling.rst
@@ -292,7 +292,9 @@ Recycling Algorithm
 
 
 
-.. _`RecyclingAlgorithm}` :raw-latex:`\label{Recycling`: RecyclingAlgorithm}` :raw-latex:`\label{Recycling
+.. _`RecyclingAlgorithm}` 
+
+.. _`Recycling`: RecyclingAlgorithm`: Recycling`: RecyclingAlgorithm :raw-latex:`\label{Recycling
 
 After all Volumes of a Pool have been pruned (as mentioned above, this
 happens when a Job needs a new Volume and no appendable Volumes are

diff --git a/docs/manuals/en/new_main_reference/source/spooling.rst b/docs/manuals/en/new_main_reference/source/spooling.rst
@@ -5,7 +5,9 @@ Data Spooling
 
 
 
-.. _`sec:spooling}` :raw-latex:`\label{sec:DataSpooling`: sec:spooling}` :raw-latex:`\label{sec:DataSpooling
+.. _`sec:spooling}` 
+
+.. _`sec:DataSpooling`: sec:spooling`: sec:DataSpooling`: sec:spooling :raw-latex:`\label{sec:DataSpooling
 .. index:: General; Data Spooling 
 .. _`Data Spooling`:
 

diff --git a/docs/manuals/en/new_main_reference/source/state.rst b/docs/manuals/en/new_main_reference/source/state.rst
@@ -52,7 +52,7 @@ What is Implemented
       current backup or a backup prior to a specified time and date.
 
    -  Listing and Restoration of files using stand-alone
-      :command:`bls}` and :raw-latex:`\command{bextract`
+      :command:`bls` and :command:`bextract`
       tool programs. Among other things, this permits extraction of
       files when Bareos and/or the catalog are not available. Note, the
       recommended way to restore files is using the restore command in

diff --git a/docs/manuals/en/new_main_reference/source/tls.rst b/docs/manuals/en/new_main_reference/source/tls.rst
@@ -20,13 +20,19 @@ Transport Encryption
 .. index:: General; Transport Encryption 
 .. _`Transport Encryption`:
 
-:raw-latex:`\index[general]{TLS}` .. index:: General; SSL 
-:raw-latex:`\index[general]{TLS}` .. _`SSL`:
-:raw-latex:`\index[general]{TLS}` 
+.. index:: General; TLS 
+.. _`TLS`:
+ .. index:: General; SSL 
+.. index:: General; TLS 
+.. _`TLS`:
+ .. _`SSL`:
+.. index:: General; TLS 
+.. _`TLS`:
+
 
 Bareos TLS (Transport Layer Security) is built-in network encryption
 code to provide secure network transport similar to that offered by
-:command:`stunnel}` or :raw-latex:`\command{ssh`. The data
+:command:`stunnel` or :command:`ssh`. The data
 written to Volumes by the Storage daemon is not encrypted by this code.
 For data encryption, please see the
 :ref:`DataEncryption` chapter.

diff --git a/docs/manuals/en/new_main_reference/tex2rst.sh b/docs/manuals/en/new_main_reference/tex2rst.sh
@@ -13,186 +13,25 @@ echo '==========================='
 #
 ###############################################################################
 
-# todo (maybe)
-
 ###############################################################################
 #
 # CONVERT
 #
 ###############################################################################
 
-### INTRODUCTION AND TUTORIAL
-
-echo 'general.tex'
-pandoc --verbose -f latex+raw_tex -t rst ${ORIGIN_DIR}general.tex -o ${TARGET_DIR}general.rst
-
-echo 'state.tex'
-pandoc --verbose -f latex+raw_tex -t rst ${ORIGIN_DIR}state.tex -o ${TARGET_DIR}state.rst
-
-echo 'install.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}install.tex -o ${TARGET_DIR}install.rst
-
-echo 'webui.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}webui.tex -o ${TARGET_DIR}webui.rst
-
-echo 'update.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}update.tex -o ${TARGET_DIR}update.rst
-
-echo 'quickstart.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}quickstart.tex -o ${TARGET_DIR}quickstart.rst
-
-echo 'tutorial.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}tutorial.tex -o ${TARGET_DIR}tutorial.rst
-
-echo 'critical.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}critical.tex -o ${TARGET_DIR}critical.rst
-
-### CONFIGURATION
-
-echo 'configure.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}configure.tex -o ${TARGET_DIR}configure.rst
-
-echo 'dirdconf.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}dirdconf.tex -o ${TARGET_DIR}dirdconf.rst
-
-echo 'storedconf.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}storedconf.tex -o ${TARGET_DIR}storedconf.rst
-
-echo 'filedconf.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}filedconf.tex -o ${TARGET_DIR}filedconf.rst
-
-echo 'messagesres.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}messagesres.tex -o ${TARGET_DIR}messagesres.rst
-
-echo 'consoleconf.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}consoleconf.tex -o ${TARGET_DIR}consoleconf.rst
-
-echo 'monitorconf.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}monitorconf.tex -o ${TARGET_DIR}monitorconf.rst
-
-### TASKS AND CONCEPTS
-
-echo 'bconsole.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}bconsole.tex -o ${TARGET_DIR}bconsole.rst
-
-echo 'restore.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}restore.tex -o ${TARGET_DIR}restore.rst
-
-### VOLUME MANAGEMENT
-
-echo 'disk.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}disk.tex -o ${TARGET_DIR}disk.rst
-
-echo 'recycling.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}recycling.tex -o ${TARGET_DIR}recycling.rst
-
-echo 'pools.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}pools.tex -o ${TARGET_DIR}pools.rst
-
-echo 'autochangers.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}autochangers.tex -o ${TARGET_DIR}autochangers.rst
-
-echo 'tape-without-autochanger.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}tape-without-autochanger.tex -o ${TARGET_DIR}tape-without-autochanger.rst
-
-echo 'spooling.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}spooling.tex -o ${TARGET_DIR}spooling.rst
-
-echo 'migration.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}migration.tex -o ${TARGET_DIR}migration.rst
-
-echo 'always-incremental.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}always-incremental.tex -o ${TARGET_DIR}always-incremental.rst
-
-echo 'basejob.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}basejob.tex -o ${TARGET_DIR}basejob.rst
-
-echo 'plugin.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}plugins.tex -o ${TARGET_DIR}plugins.rst
-
-echo 'win32.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}win32.tex -o ${TARGET_DIR}win32.rst
-
-### NETWORK SETUP
-
-echo 'client-initiated-connection.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}client-initiated-connection.tex -o ${TARGET_DIR}client-initiated-connection.rst
-
-echo 'passiveclient.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}passiveclient.tex -o ${TARGET_DIR}passiveclient.rst
-
-echo 'lanaddress.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}lanaddress.tex -o ${TARGET_DIR}lanaddress.rst
-
-echo 'tls.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}tls.tex -o ${TARGET_DIR}tls.rst
-
-echo 'dataencryption.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}dataencryption.tex -o ${TARGET_DIR}dataencryption.rst
-
-### NDMP BACKUPS WITH BAREOS
-
-echo 'ndmp.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}ndmp.tex -o ${TARGET_DIR}ndmp.rst
-
-echo 'catmaintenance.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}catmaintenance.tex -o ${TARGET_DIR}catmaintenance.rst
-
-echo 'security.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}security.tex -o ${TARGET_DIR}security.rst
-
-### APPENDIX
-
-# A
-echo 'requirements.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}requirements.tex -o ${TARGET_DIR}requirements.rst
-
-# B
-echo 'supportedoses.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}supportedoses.tex -o ${TARGET_DIR}supportedoses.rst
-
-# C
-echo 'programs.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}programs.tex -o ${TARGET_DIR}programs.rst
-
-# D
-echo 'bootstrap.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}bootstrap.tex -o ${TARGET_DIR}bootstrap.rst
-
-# E
-echo 'verify.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}verify.tex -o ${TARGET_DIR}verify.rst
-
-# F
-echo 'backward-compability.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}backward-compability.tex -o ${TARGET_DIR}backward-compatibility.rst
-
-# G
-echo 'tables.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}tables.tex -o ${TARGET_DIR}tables.rst
-
-# H
-echo 'howto.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}howto.tex -o ${TARGET_DIR}howto.rst
-
-# I
-echo 'rescue.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}rescue.tex -o ${TARGET_DIR}rescue.rst
-
-# J
-echo 'troubleshooting.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}troubleshooting.tex -o ${TARGET_DIR}troubleshooting.rst
-
-# K
-echo 'debug.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}debug.tex -o ${TARGET_DIR}debug.rst
-
-# L
-echo 'releasenotes.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}releasenotes.tex -o ${TARGET_DIR}releasenotes.rst
-
-# M
-echo 'license.tex'
-pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}license.tex -o ${TARGET_DIR}license.rst
 
-exit
+for file in general.tex state.tex install.tex webui.tex update.tex \
+  quickstart.tex tutorial.tex critical.tex configure.tex dirdconf.tex \
+  storedconf.tex filedconf.tex messagesres.tex consoleconf.tex monitorconf.tex \
+  bconsole.tex restore.tex disk.tex recycling.tex pools.tex autochangers.tex \
+  tape-without-autochanger.tex spooling.tex migration.tex \
+  always-incremental.tex basejob.tex plugin.tex win32.tex \
+  client-initiated-connection.tex passiveclient.tex lanaddress.tex tls.tex \
+  dataencryption.tex ndmp.tex catmaintenance.tex security.tex requirements.tex \
+  supportedoses.tex programs.tex bootstrap.tex verify.tex \
+  backward-compability.tex tables.tex howto.tex rescue.tex troubleshooting.tex \
+  debug.tex releasenotes.tex license.tex;
+do
+  echo ${file}
+  pandoc --verbose  -f latex+raw_tex -t rst ${ORIGIN_DIR}${file} -o ${TARGET_DIR}${file}
+done