From 97d82a72770ea17020b14e6f10884e8e9e71a21f Mon Sep 17 00:00:00 2001 From: Miguel Serrano Date: Thu, 25 Jun 2020 12:29:29 +0200 Subject: [PATCH] Fixed syntex --- hotfix/2.3.1/Dockerfile | 7 +++++++ hotfix/2.3.1/check-clsi-setting-exists.patch | 11 +++++++++++ 2 files changed, 18 insertions(+) create mode 100644 hotfix/2.3.1/Dockerfile create mode 100644 hotfix/2.3.1/check-clsi-setting-exists.patch diff --git a/hotfix/2.3.1/Dockerfile b/hotfix/2.3.1/Dockerfile new file mode 100644 index 0000000000..36f136aacc --- /dev/null +++ b/hotfix/2.3.1/Dockerfile @@ -0,0 +1,7 @@ +FROM sharelatex/sharelatex:2.3.0 + + +# Patch: Fixes NPE when invoking synctex (https://github.com/overleaf/overleaf/issues/756) +ADD check-clsi-setting-exists.patch /var/www/sharelatex/clsi/app/js/check-clsi-setting-exists.patch +RUN cd /var/www/sharelatex/clsi/app/js && \ + patch < check-clsi-setting-exists.patch diff --git a/hotfix/2.3.1/check-clsi-setting-exists.patch b/hotfix/2.3.1/check-clsi-setting-exists.patch new file mode 100644 index 0000000000..6f6535bc69 --- /dev/null +++ b/hotfix/2.3.1/check-clsi-setting-exists.patch @@ -0,0 +1,11 @@ +--- a/app/js/CompileManager.js ++++ b/app/js/CompileManager.js +@@ -536,7 +536,7 @@ module.exports = CompileManager = { + compileName, + command, + directory, +- Settings.clsi != null ? Settings.clsi.docker.image : undefined, ++ Settings.clsi && Settings.clsi.docker ? Settings.clsi.docker.image : undefined, + timeout, + {}, + function(error, output) {