[Libreoffice-commits] online.git: docker/l10n-docker-nightly.sh

Christian Lohmaier (via logerrit) logerrit at kemper.freedesktop.org
Fri May 15 20:30:33 UTC 2020


 docker/l10n-docker-nightly.sh |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d6b8a37eb103fe8457e173458cdce670fda9ec45
Author:     Christian Lohmaier <lohmaier+github at googlemail.com>
AuthorDate: Fri May 15 12:50:33 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Fri May 15 22:30:14 2020 +0200

    set INSTDIR again in and check for dockerfile in proper location
    
    f'up fix to 607ddbff466d145d0dcf87b2759c7e4d02b28f1d
    
    Change-Id: Idbb5191afcb9baab5c58e43e1b2511493491f029
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94291
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/docker/l10n-docker-nightly.sh b/docker/l10n-docker-nightly.sh
index e921a4283..dcd72b0ee 100755
--- a/docker/l10n-docker-nightly.sh
+++ b/docker/l10n-docker-nightly.sh
@@ -53,6 +53,7 @@ echo "LibreOffice build target: '$LIBREOFFICE_BUILD_TARGET'"
 
 
 SRCDIR=$(realpath `dirname $0`)
+INSTDIR="$SRCDIR/instdir"
 
 if [ -z "$(lsb_release -si)" ]; then
 	echo "WARNING: Unable to determine your distribution"
@@ -62,7 +63,7 @@ if [ -z "$(lsb_release -si)" ]; then
 else
 	HOST_OS=$(lsb_release -si)
 fi
-if ! [ -e "$HOST_OS" ]; then
+if ! [ -e "$SRCDIR/$HOST_OS" ]; then
   echo "There is no suitable Dockerfile for your host system."
   echo "Please fix this problem and re-run $0"
   exit 1


More information about the Libreoffice-commits mailing list