Tweaks to uninstaller #patch

AdminUI · Aug 19, 2022 · db82e38 · db82e38
1 parent d1ce996
commit db82e38
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/src/Controllers/UninstallController.php b/src/Controllers/UninstallController.php
@@ -31,6 +31,11 @@ public function index()
             'root' => base_path('app'),
         ]);
 
+        $baseDir = Storage::build([
+            'driver' => 'local',
+            'root' => base_path()
+        ]);
+
         if ($packages->exists($installDirectory)) {
             $packages->deleteDirectory($installDirectory);
         }
@@ -57,10 +62,14 @@ public function index()
             $appDir->delete('Http/Middleware/HandleInertiaRequests.php');
         }
 
-        $this->runCommand(["rm,", ".env"]);
-        $this->runCommand(["cp", ".env-clean", ".env"]);
-        $this->runCommand(["rm", "composer.json"]);
-        $this->runCommand(["cp", "composer-clean.json", "composer.json"]);
+        if ($baseDir->exists('.env-clean')) {
+            $this->runCommand(["rm,", ".env"]);
+            $this->runCommand(["cp", ".env-clean", ".env"]);
+        }
+        if ($baseDir->exists('composer-clean.json')) {
+            $this->runCommand(["rm", "composer.json"]);
+            $this->runCommand(["cp", "composer-clean.json", "composer.json"]);
+        }
 
         $this->runComposerUpdate();
 

diff --git a/src/views/index.blade.php b/src/views/index.blade.php
@@ -91,7 +91,7 @@
                     /* ******************************************
                      * STEP TWO
                      ****************************************** */
-                    this.installMessage = `Extracting AdminUI ${this.version} package...`;
+                    this.installMessage = "Extracting AdminUI " + this.version " + package...";
                     const stepTwoResult = await fetch("{{ route('adminui.installer.two') }}", {
                         method: "POST",
                         headers: jsonHeaders,

diff --git a/src/views/maintenance.blade.php b/src/views/maintenance.blade.php
@@ -1,10 +1,10 @@
-<x-adminui-installer::layout title="AdminUI Installer: Installation already exists">
+<x-adminui-installer::layout title="Site is not currently available">
     <div class="max-w-xl">
         <div class="flex justify-center mb-4 transition-colors duration-300">
             <x-adminui-installer::logo width="w-20"></x-adminui-installer::logo>
         </div>
         <p class="mt-8">
-            This webiste is currently undergoing maintenance.<br />
+            This website is currently undergoing maintenance.<br />
             Please check back in a few minutes.
         </p>
     </div>