diff --git a/app/Repositories/ToolRepository.php b/app/Repositories/ToolRepository.php index 3184a5cf..cfe27405 100644 --- a/app/Repositories/ToolRepository.php +++ b/app/Repositories/ToolRepository.php @@ -17,11 +17,13 @@ use Symfony\Component\Mime\Email; class ToolRepository extends BaseRepository { + const BACKUP_EXCLUDES = ['vendor', 'node_modules', '.git', '.idea', '.settings', '.DS_Store', '.github']; + public function backupWeb($method = null): array { $webRoot = base_path(); $dirName = basename($webRoot); - $excludes = ['vendor', 'node_modules', '.git', '.idea', '.settings', '.DS_Store', '.github']; + $excludes = self::BACKUP_EXCLUDES; $baseFilename = sprintf('%s/%s.web.%s', sys_get_temp_dir(), $dirName, date('Ymd.His')); if (command_exists('tar') && ($method === 'tar' || $method === null)) { $filename = $baseFilename . ".tar.gz"; diff --git a/nexus/Install/Update.php b/nexus/Install/Update.php index 3456cfb2..b68e17e2 100644 --- a/nexus/Install/Update.php +++ b/nexus/Install/Update.php @@ -18,6 +18,7 @@ use App\Repositories\AttendanceRepository; use App\Repositories\BonusRepository; use App\Repositories\ExamRepository; use App\Repositories\TagRepository; +use App\Repositories\ToolRepository; use Carbon\Carbon; use GuzzleHttp\Client; use Illuminate\Database\Eloquent\Model; @@ -366,7 +367,7 @@ class Update extends Install foreach (glob("$extractDir/*") as $path) { if (is_dir($path)) { - $excludes = ['.git', 'public/favicon.ico', '.env']; + $excludes = array_merge(ToolRepository::BACKUP_EXCLUDES, ['public/favicon.ico', '.env']); if (!in_array('composer', $includes)) { $excludes[] = 'composer.lock'; $excludes[] = 'composer.json';