From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 21 Dec 2021 10:38:44 +0000 (+0100)
Subject: wait #4972 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=71c02b8696076a6068dc7b78dbc8359832a9014f;p=odl.git

wait #4972 @0.5
---

diff --git a/app/Jobs/ProducePackage.php b/app/Jobs/ProducePackage.php
index b9a195b..b1d230f 100644
--- a/app/Jobs/ProducePackage.php
+++ b/app/Jobs/ProducePackage.php
@@ -46,7 +46,7 @@ class ProducePackage implements ShouldQueue, ShouldBeUnique {
 
         $this->vdir->sync(true);
 
-        Zip::archive($this->dir,$this->dir.'.zip');
+        Zip::archive($this->dir, $this->dir . '.zip');
     }
 
     /**
@@ -61,8 +61,12 @@ class ProducePackage implements ShouldQueue, ShouldBeUnique {
             foreach ($files as $match) {
                 $match = str_replace('\\/', '/', $match);
                 $f = public_path('storage/' . $match);
+                $f1 = storage_path('app/public/' . $match);
+
                 if (file_exists($f)) {
                     $this->vdir->copy($f, 'storage/' . $match);
+                } else if (file_exists($f1)) {
+                    $this->vdir->copy($f1, 'storage/' . $match);
                 } else {
                     echo 'Missing ' . $f . "\n";
                 }