From c9bf3f004190ab5fef9b6cc9eeef03a49352a002 Mon Sep 17 00:00:00 2001 From: Martin Folkerts Date: Tue, 31 Oct 2023 14:07:47 +0100 Subject: [PATCH] added installPackages.R --- laravel_app/app/Livewire/Reports/ReportManager.php | 13 ++++++++++--- laravel_app/config/livewire.php | 2 +- laravel_app/public/index.php | 1 - laravel_app/resources/views/layouts/app.blade.php | 9 +++++++++ 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/laravel_app/app/Livewire/Reports/ReportManager.php b/laravel_app/app/Livewire/Reports/ReportManager.php index 46eae3e..2484c54 100644 --- a/laravel_app/app/Livewire/Reports/ReportManager.php +++ b/laravel_app/app/Livewire/Reports/ReportManager.php @@ -58,7 +58,7 @@ public function createReport() ])->validateWithBag('createReport'); - $projectFolder = base_path('../'); + $projectFolder = base_path('../'); $command = [ sprintf('%sbuild_report.sh', $projectFolder), @@ -68,18 +68,25 @@ public function createReport() // Convert commands array to a single string $process = new Process($command); - $process->setTimeout(3600); // stel een geschikte timeout in + $currentPath = '/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin/Users/mfolkerts/anaconda3/bin:/Library/Apple/usr/bin'; + + $process->setEnv(['PATH' => $currentPath.':/usr/local/Cellar/pandoc/3.1.8/bin/pandoc']); + $process->setTimeout(36000); // stel een geschikte timeout in $process->start(); try { $myOutput = []; - $process->wait(function ($type, $buffer) use (&$myOutput){ + $process->wait(function ($type, $buffer) use (&$myOutput) { $this->stream(to: 'processOutput', content: $buffer); $myOutput[] = $buffer; + logger($buffer); }); + logger('done'); $this->processOutput = collect($myOutput)->join('\n'); } catch (ProcessFailedException $exception) { + logger('mee------------meee'); + logger ('error', $exception->getMessage()); echo $exception->getMessage(); } diff --git a/laravel_app/config/livewire.php b/laravel_app/config/livewire.php index cdce349..3946ffa 100644 --- a/laravel_app/config/livewire.php +++ b/laravel_app/config/livewire.php @@ -38,7 +38,7 @@ | */ - 'layout' => 'layouts.app', + 'layout' => 'components.layouts.app', /* |--------------------------------------------------------------------------- diff --git a/laravel_app/public/index.php b/laravel_app/public/index.php index 1d69f3a..24d0093 100644 --- a/laravel_app/public/index.php +++ b/laravel_app/public/index.php @@ -1,5 +1,4 @@ @vite(['resources/css/app.css', 'resources/js/app.js']) + + @livewireStyles