[Libreoffice-commits] help.git: help3xsl/xhp2html.sh

[Shinnok]

 help3xsl/xhp2html.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b07c31d8dfa44e18560eaacfe7f63ef2e5e23ff7
Author: Shinnok <admin at shinnok.com>
Date:   Wed Nov 29 12:48:22 2017 +0200

    Replace usage of readlink -f with realpath.
    
    For consistency reasons, the other scripts use the latter. Additionally on
    macOS/BSD readlink -f option is not available, nor other default tools
    for canonicalizing paths, so looking for GNU's realpath in the first
    place is a better bet.
    
    Change-Id: I77b82a956f63c66e352a372895cd623f83916168
    Reviewed-on: https://gerrit.libreoffice.org/45486
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
    Tested-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/help3xsl/xhp2html.sh b/help3xsl/xhp2html.sh
index 4b3734254..b4e56b5a7 100755
--- a/help3xsl/xhp2html.sh
+++ b/help3xsl/xhp2html.sh
@@ -193,7 +193,7 @@ if test "${dir}" = "/"; then
 echo "error: cannot find \"program\" dir from \"$(pwd)\""
 exit 1
 fi
-rootHelpex=$(readlink -f "${rootHelpex}/..")
+rootHelpex=$(realpath "${rootHelpex}/..")
 done
 
 exedir="${rootHelpex}"/workdir/LinkTarget/Executable