fix publishing method

Author: pxpm

src/Console/Commands/Traits/PublishableStubTrait.php

@@ -1,23 +1,21 @@
 <?php
 
 namespace Backpack\Generators\Console\Commands\Traits;
+use Illuminate\Support\Str;
 
 trait PublishableStubTrait
 {
     /**
-     * Check if the stub exists in the project's stubs folder.
-     * If it does, return the path to it.
-     * If it doesn't, return the path to the stub in the package.
-     *
-     * @param  string  $path
-     * @return string
+     * Return the path to the stub
      */
     public function getStubPath(string $path): string
     {
-        if (file_exists(base_path("stubs/backpack/generators/{$path}.stub"))) {
-            return base_path("stubs/backpack/generators/{$path}.stub");
+        $path = Str::finish($path, '.stub');
+
+        if (file_exists(base_path("stubs/backpack/generators/{$path}"))) {
+            return base_path("stubs/backpack/generators/{$path}");
         }
 
-        return __DIR__."/../../stubs/{$path}.stub";
+        return __DIR__."/../../stubs/{$path}";
     }
 }

src/Console/Commands/Views/PublishOrCreateViewBackpackCommand.php

@@ -9,6 +9,7 @@
 abstract class PublishOrCreateViewBackpackCommand extends GeneratorCommand
 {
     use \Backpack\CRUD\app\Console\Commands\Traits\PrettyCommandOutput;
+    use \Backpack\Generators\Console\Commands\Traits\PublishableStubTrait;
 
     /**
      * The source file to copy from.
@@ -41,12 +42,7 @@ abstract class PublishOrCreateViewBackpackCommand extends GeneratorCommand
      */
     protected function getStub()
     {
-        // check if base_path('stubs/backpack/generators/$FILE') exists, and use that
-        if (file_exists(base_path('stubs/backpack/generators/generators/'.$this->stub))) {
-            return base_path('stubs/backpack/generators/generators/'.$this->stub);
-        }
-
-        return __DIR__.'/../../stubs/'.$this->stub;
+        return $this->getStubPath($this->stub);
     }
 
     /**

src/GeneratorsServiceProvider.php

@@ -55,6 +55,6 @@ public function boot(): void
 
         $this->publishes([
             __DIR__.'/Console/stubs' => base_path('stubs/backpack/generators'),
-        ], 'stubs');
+        ], 'backpack-generators-stubs');
     }
 }