From cb40f0552f23beab051a4271cd413c86d88ad9c1 Mon Sep 17 00:00:00 2001
From: Pedro X <pxpm88@gmail.com>
Date: Sun, 16 Jul 2023 10:25:31 +0100
Subject: [PATCH] fix publishing method

---
 .../Commands/Traits/PublishableStubTrait.php     | 16 +++++++---------
 .../Views/PublishOrCreateViewBackpackCommand.php |  8 ++------
 src/GeneratorsServiceProvider.php                |  2 +-
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/Console/Commands/Traits/PublishableStubTrait.php b/src/Console/Commands/Traits/PublishableStubTrait.php
index 5c0ceca..ef25980 100644
--- a/src/Console/Commands/Traits/PublishableStubTrait.php
+++ b/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}";
     }
 }
diff --git a/src/Console/Commands/Views/PublishOrCreateViewBackpackCommand.php b/src/Console/Commands/Views/PublishOrCreateViewBackpackCommand.php
index a1d31fb..eb995c9 100644
--- a/src/Console/Commands/Views/PublishOrCreateViewBackpackCommand.php
+++ b/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);
     }
 
     /**
diff --git a/src/GeneratorsServiceProvider.php b/src/GeneratorsServiceProvider.php
index de70be3..833daf5 100644
--- a/src/GeneratorsServiceProvider.php
+++ b/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');
     }
 }