[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1920-gddedc1b

Franck Villaume nerville at libremir.placard.fr.eu.org
Thu Jun 8 19:47:16 CEST 2017


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  ddedc1bd7fe5bc22e687594559a182993407a6ff (commit)
      from  8b15dae0e9ddda92864d70dd5ca2b2954be863de (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=ddedc1bd7fe5bc22e687594559a182993407a6ff

commit ddedc1bd7fe5bc22e687594559a182993407a6ff
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Thu Jun 8 17:47:11 2017 +0000

    fix unoconv exec in docker context

diff --git a/src/common/docman/engine/parser_unoconv_document.php b/src/common/docman/engine/parser_unoconv_document.php
index 04d1e39..9b2f094 100755
--- a/src/common/docman/engine/parser_unoconv_document.php
+++ b/src/common/docman/engine/parser_unoconv_document.php
@@ -39,7 +39,7 @@ if (!is_file($fichin))
 	exit (1);
 
 $fichout = tempnam(sys_get_temp_dir(), 'docman');
-$cmd = "/usr/bin/unoconv -d document -f text -o $fichout $fichin";
+$cmd = "HOME=/tmp; /usr/bin/unoconv -d document -f text -o $fichout $fichin";
 $res = shell_exec($cmd);
 
 echo parser_text($fichout);
diff --git a/src/common/docman/engine/parser_unoconv_presentation.php b/src/common/docman/engine/parser_unoconv_presentation.php
index 1f68675..f8c886e 100755
--- a/src/common/docman/engine/parser_unoconv_presentation.php
+++ b/src/common/docman/engine/parser_unoconv_presentation.php
@@ -39,7 +39,7 @@ if (!is_file($fichin))
 	exit (1);
 
 $fichout = tempnam(sys_get_temp_dir(), 'docman');
-$cmd = "/usr/bin/unoconv -d presentation -f pdf -o $fichout $fichin";
+$cmd = "HOME=/tmp; /usr/bin/unoconv -d presentation -f pdf -o $fichout $fichin";
 $res = shell_exec($cmd);
 
 echo parser_pdf($fichout);
diff --git a/src/common/docman/engine/parser_unoconv_spreadsheet.php b/src/common/docman/engine/parser_unoconv_spreadsheet.php
index abfcda0..4a751e1 100755
--- a/src/common/docman/engine/parser_unoconv_spreadsheet.php
+++ b/src/common/docman/engine/parser_unoconv_spreadsheet.php
@@ -39,7 +39,7 @@ if (!is_file($fichin))
 	exit (1);
 
 $fichout = tempnam(sys_get_temp_dir(), 'docman');
-$cmd = "/usr/bin/unoconv -d spreadsheet -f pdf -o $fichout $fichin";
+$cmd = "HOME=/tmp; /usr/bin/unoconv -d spreadsheet -f pdf -o $fichout $fichin";
 $res = shell_exec($cmd);
 
 echo parser_pdf($fichout);

-----------------------------------------------------------------------

Summary of changes:
 src/common/docman/engine/parser_unoconv_document.php     | 2 +-
 src/common/docman/engine/parser_unoconv_presentation.php | 2 +-
 src/common/docman/engine/parser_unoconv_spreadsheet.php  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list