Skip to content

A free open source IT asset/license management system

Added .gitignore to skipped files

snipea9855661993d
diff --git a/app/Console/Commands/RestoreFromBackup.php b/app/Console/Commands/RestoreFromBackup.php
index c7a5fe3843..3ea454b419 100644
--- a/app/Console/Commands/RestoreFromBackup.php
+++ b/app/Console/Commands/RestoreFromBackup.php
@@ -638,10 +638,13 @@ class RestoreFromBackup extends Command
continue;
}
foreach (scandir($dir) ?: [] as $entry) {
- if ($entry === '.' || $entry === '..' || $entry === '.gitkeep') {
+ // Preserve both .gitkeep and .gitignore so the directory
+ // still exists after a restore AND still carries its
+ // ignore rules for git-installed deployments.
+ if ($entry === '.' || $entry === '..' || $entry === '.gitkeep' || $entry === '.gitignore') {
continue;
}
- $path = $dir . '/' . $entry;
+ $path = $dir.'/'.$entry;
if (is_file($path)) {
@unlink($path);
}