[Libreoffice-commits] help.git: help3xsl/makehelp.sh help3xsl/makelocal.sh help3xsl/makeonline.sh

[Shinnok]

 help3xsl/makehelp.sh   |   13 ++++++++++++-
 help3xsl/makeonline.sh |   24 ------------------------
 2 files changed, 12 insertions(+), 25 deletions(-)

New commits:
commit c09e0355995d329cbd0c60ff7e6008c0f06b45df
Author: Shinnok <admin at shinnok.com>
Date:   Wed Dec 6 13:16:05 2017 +0100

    Merge makelocal and makeonline into single script.
    
    Scripts were identical; only difference is whether we pass
    local yes/no to get_html.sh. Choice is now expressed via
    first param to makehelp.sh; build local is default.
    
    Change-Id: Icbe274fe6d9aeb86c7950aa69daf574e271e3b84
    Reviewed-on: https://gerrit.libreoffice.org/45943
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
    Tested-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/help3xsl/makelocal.sh b/help3xsl/makehelp.sh
similarity index 76%
rename from help3xsl/makelocal.sh
rename to help3xsl/makehelp.sh
index b455a5ba7..c2590cc74 100755
--- a/help3xsl/makelocal.sh
+++ b/help3xsl/makehelp.sh
@@ -6,16 +6,27 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+# Arguments
+
+# $1 build local or webroot help [default=yes]
+# values: yes no
+
 productVersion=6.0
 workDir=$(realpath '../../workdir')
 langDirSource=$workDir'/HelpTranslatePartTarget'
+offline=$1
+
+if [ -z $offline ]
+then
+offline=yes
+fi
 
 ./get_hid2file.sh $productVersion $workDir
 
 for lang in $(ls $langDirSource)
 do
 ./get_bookmark.sh $lang $productVersion $workDir
-./get_html.sh $lang $productVersion $workDir 'yes' '/'
+./get_html.sh $lang $productVersion $workDir $offline '/'
 ./get_tree.sh $lang $productVersion $workDir
 done
 
diff --git a/help3xsl/makeonline.sh b/help3xsl/makeonline.sh
deleted file mode 100755
index 90813de2e..000000000
--- a/help3xsl/makeonline.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#/bin/bash
-
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-productVersion=6.0
-workDir=$(realpath '../../workdir')
-langDirSource=$workDir'/HelpTranslatePartTarget'
-
-./get_hid2file.sh $productVersion $workDir
-
-for lang in $(ls $langDirSource)
-do
-./get_bookmark.sh $lang $productVersion $workDir
-./get_html.sh $lang $productVersion $workDir 'no' '/'
-./get_tree.sh $lang $productVersion $workDir
-done
-
-./get_media.sh 'dummy' $productVersion $workDir
-
-exit