- remove symlink method

- lock LFM version to 1.7.7
makrif · Nov 28, 2017 · 9677041 · 9677041
1 parent 204bc32
commit 9677041
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 40 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "barryvdh/laravel-dompdf": "0.8.*",
         "doctrine/dbal": "~2.3",        
         "maatwebsite/excel": "~2.1.0",                
-        "unisharp/laravel-filemanager": "1.7.*",
+        "unisharp/laravel-filemanager": "1.7.7",
         "intervention/imagecache":"2.*"
     },
     "autoload": {

diff --git a/src/CRUDBoosterServiceProvider.php b/src/CRUDBoosterServiceProvider.php
@@ -33,10 +33,11 @@ public function boot()
 
         if(!file_exists(app_path('Http/Controllers/AdminCmsUsersController.php'))) {
             $this->publishes([__DIR__.'/userfiles/controllers/AdminCmsUsersController.php' => app_path('Http/Controllers/AdminCmsUsersController.php')],'cb_user_controller');
-        }
+        }        
 
-        /* Symlink Fixed If Missing */
-        $this->symlinkFixed();
+        $this->publishes([
+            __DIR__.'/assets'=>public_path('vendor/crudbooster')
+        ],'cb_asset');  
 
         require __DIR__.'/validations/validation.php';        
         require __DIR__.'/routes.php';                        
@@ -67,7 +68,6 @@ public function register()
         $this->commands('crudboosterinstall');
         $this->commands('crudboosterupdate');
 
-
         $this->app->register('Barryvdh\DomPDF\ServiceProvider');
         $this->app->register('Maatwebsite\Excel\ExcelServiceProvider');
         $this->app->register('Unisharp\Laravelfilemanager\LaravelFilemanagerServiceProvider');
@@ -91,37 +91,5 @@ private function registerCrudboosterCommand()
         $this->app->singleton('crudboosterupdate',function() {
             return new CrudboosterUpdateCommand;
         });        
-    }
-
-    private function symlinkFixed() {
-        //Create vendor folder at public        
-        if(!file_exists(public_path('vendor'))) {            
-            mkdir(public_path('vendor'),0777);
-        }
-
-        //Create symlink for uploads path        
-        //Deprecated for a while, because uploads now handled by FileController.php
-        // if(file_exists(public_path('uploads'))) {              
-        //     $uploadPath = public_path('uploads');                        
-        //     if(realpath($uploadPath) == $uploadPath) {                            
-        //         // rrmdir(public_path('uploads'));
-        //         rename(public_path('uploads'),'uploads.old.'.str_random(5));
-        //         app('files')->link(storage_path('app'), public_path('uploads'));   
-        //     }           
-        // }else{            
-        //     app('files')->link(storage_path('app'), public_path('uploads'));
-        // }      
-
-        //Crate symlink for assets        
-        if(file_exists(public_path('vendor'.DIRECTORY_SEPARATOR.'crudbooster'))) { 
-            $vendorpath = public_path('vendor'.DIRECTORY_SEPARATOR.'crudbooster');                        
-            if(realpath($vendorpath) == $vendorpath) {                                     
-                // rrmdir(public_path('vendor'.DIRECTORY_SEPARATOR.'crudbooster'));
-                rename(public_path('vendor'.DIRECTORY_SEPARATOR.'crudbooster'),'crudbooster.old.'.str_random(5));
-                app('files')->link(__DIR__.'/assets',public_path('vendor/crudbooster'));     
-            }        
-        }else{                        
-            app('files')->link(__DIR__.'/assets',public_path('vendor/crudbooster'));
-        }
-    }
+    }    
 }
diff --git a/src/commands/CrudboosterInstallationCommand.php b/src/commands/CrudboosterInstallationCommand.php
@@ -50,7 +50,11 @@ public function handle()
         }
 
 
-		if($this->confirm('Do you have setting the database configuration at .env ?')) {			
+		if($this->confirm('Do you have setting the database configuration at .env ?')) {	
+
+			if(!file_exists(public_path('vendor'))) {            
+	            mkdir(public_path('vendor'),0777);
+	        }		
 
 			$this->info('Publishing CRUDBooster needs file...');
 			$this->call('vendor:publish');	

diff --git a/src/commands/CrudboosterUpdateCommand.php b/src/commands/CrudboosterUpdateCommand.php
@@ -38,7 +38,11 @@ public function handle()
 		$this->header();
 		$this->checkRequirements();
 
-		$this->info('Updating: ');								 
+		$this->info('Updating: ');	
+
+		if(!file_exists(public_path('vendor'))) {            
+            mkdir(public_path('vendor'),0777);
+        }							 
 
 		$this->info('Publishing CRUDBooster needs file...');
 		$this->call('vendor:publish');