[Libreoffice-commits] core.git: solenv/bin

Thorsten Behrens Thorsten.Behrens at CIB.de
Sat May 20 03:32:24 UTC 2017


 solenv/bin/mkdocs.sh |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 91c9e060b935fb08837d360ee4f8fd670e1185e1
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Sat May 20 05:27:48 2017 +0200

    mkdocs.sh: alias cmd variant to canonical name
    
    Otherwise being flexible during checking of required commands
    is a bit pointless.
    
    Change-Id: I9a6e283c816a87f35ce7913c294eaacb7da9a95b

diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh
index 1be57f9cc8f5..8f627525203f 100755
--- a/solenv/bin/mkdocs.sh
+++ b/solenv/bin/mkdocs.sh
@@ -93,14 +93,15 @@ function check_cmd {
   cmds_needed="$1"
   error_msg="$2"
 
-  found=0
+  found=0; cmd=
   for cmd_needed in $cmds_needed; do
-    which $cmd_needed > /dev/null 2>&1 && found=1
+    which $cmd_needed > /dev/null 2>&1 && { found=1; cmd=$cmd_needed; }
   done
   if [ $found = 0 ]; then
       echo "$error_msg" >&2
       exit 1
   fi
+  alias "${cmds_needed%% *}"=$cmd
 }
 
 function setup {


More information about the Libreoffice-commits mailing list