From f44b7ae3134ec6520c38f6a7db62edac8f2b48e3 Mon Sep 17 00:00:00 2001 From: Jay MOULIN Date: Tue, 15 Dec 2020 20:03:30 +0100 Subject: [PATCH] related #83 - adds UTF-8 jdownloader parms and Locales --- Dockerfile | 8 ++++++-- Makefile | 2 +- daemon.sh | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7c17360..2d932f6 100755 --- a/Dockerfile +++ b/Dockerfile @@ -6,13 +6,17 @@ COPY qemu-arm-static /usr/bin/ FROM builder ARG ARCH=armhf -ARG VERSION="1.4.2" +ARG VERSION="1.4.3" LABEL maintainer="Jay MOULIN " LABEL version="${VERSION}-${ARCH}" ENV LD_LIBRARY_PATH=/lib;/lib32;/usr/lib ENV XDG_DOWNLOAD_DIR=/opt/JDownloader/Downloads +ENV LC_CTYPE="en_US.UTF-8" +ENV LANG="en_US.UTF-8" +ENV LC_COLLATE="C" +ENV LANGUAGE="C.UTF-8" +ENV LC_ALL="C.UTF-8" ENV UMASK='' - COPY ./${ARCH}/*.jar /opt/JDownloader/libs/ # archive extraction uses sevenzipjbinding library # which is compiled against libstdc++ diff --git a/Makefile b/Makefile index 609e194..469274b 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 1.4.2 +VERSION ?= 1.4.3 CACHE ?= --no-cache=1 FULLVERSION ?= ${VERSION} archs ?= amd64 arm32v6 armhf arm64v8 diff --git a/daemon.sh b/daemon.sh index bcbae4d..aa0a4f6 100755 --- a/daemon.sh +++ b/daemon.sh @@ -43,7 +43,7 @@ if echo "$UMASK" | grep -Eq '0[0-7]{3}' ; then umask "$UMASK" fi -java -Djava.awt.headless=true -jar /opt/JDownloader/JDownloader.jar -norestart & +java -Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8 -Djava.awt.headless=true -jar /opt/JDownloader/JDownloader.jar -norestart & PID=$! wait $PID wait $PID