Merge pull request #22 from hexadog/develop

Develop

Author: gaetan-hexadog

config/config.php

@@ -13,14 +13,24 @@
 
 	/*
     |--------------------------------------------------------------------------
-    | Symbolic path
+    | Symbolic link path
     |--------------------------------------------------------------------------
     |
     | you can change the public themes path used for assets.
     |
     */
 	'symlink_path' => 'themes',
 
+	/*
+    |--------------------------------------------------------------------------
+    | Symbolic link relative
+    |--------------------------------------------------------------------------
+    |
+    | Determine if relative symlink should be used instead of absolute one.
+    |
+    */
+	'symlink_relative' => false,
+
 	/*
 	|--------------------------------------------------------------------------
 	| Fallback Theme

src/Providers/PackageServiceProvider.php

@@ -2,11 +2,9 @@
 
 namespace Hexadog\ThemesManager\Providers;
 
-use File;
 use ReflectionClass;
 use Illuminate\Support\Str;
 use Illuminate\Routing\Router;
-use Illuminate\Filesystem\Filesystem;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Foundation\AliasLoader;
 use Illuminate\Support\ServiceProvider;
@@ -69,12 +67,6 @@ protected function getNormalizedNamespace($prefix = '')
      */
     public function boot(Router $router)
     {
-        $publicPath = public_path(config('themes-manager.symlink_path', 'themes'));
-
-        if (!File::exists($publicPath)) {
-            app(Filesystem::class)->makeDirectory($publicPath, 0755);
-        }
-
         $this->loadViewsFrom($this->getPath('resources/views'), 'themes-manager');
         $this->loadViewComponentsAs('theme', [
             Image::class,

src/Theme.php

@@ -361,11 +361,22 @@ protected function cleanPath($path = '')
      */
     protected function registerViews()
     {
+        // Create target symlink parent directory if required
+        $publicPath = public_path(Config::get('themes-manager.symlink_path', 'themes'));
+        if (!File::exists($publicPath)) {
+            app(Filesystem::class)->makeDirectory($publicPath, 0755);
+        }
+        
         // Create symlink for public resources if not existing yet
         $assetsPath = $this->getPath('public');
         $publicAssetsPath = public_path($this->getAssetsPath());
+
         if (!File::exists($publicAssetsPath) && File::exists($assetsPath)) {
-            app(Filesystem::class)->link($assetsPath, rtrim($publicAssetsPath, DIRECTORY_SEPARATOR));
+            if (Config::get('themes-manager.symlink_relative', false)) {
+                app(Filesystem::class)->relativeLink($assetsPath, rtrim($publicAssetsPath, DIRECTORY_SEPARATOR));
+            } else {
+                app(Filesystem::class)->link($assetsPath, rtrim($publicAssetsPath, DIRECTORY_SEPARATOR));
+            }
         }
 
         // Register theme views path