Merge pull request #757 from portabilis/fix-installer

[2.6] Corrige o instalador em servidor

app/Providers/AppServiceProvider.php

@@ -13,10 +13,10 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Query\Builder as QueryBuilder;
+use Illuminate\Database\Schema\Builder as SchemaBuilder;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Str;
 use Laravel\Telescope\TelescopeServiceProvider;
@@ -74,8 +74,7 @@ public function boot()
             return $keyValueArray;
         });
 
-        // https://laravel.com/docs/5.5/migrations#indexes
-        Schema::defaultStringLength(191);
+        SchemaBuilder::defaultStringLength(191);
 
         Paginator::defaultView('vendor.pagination.default');
 

public/js/install.js

@@ -120,6 +120,9 @@ if (installButton) {
             }, {
               command: 'migrate',
               description: 'Executando migrações'
+            }, {
+              command: 'reports-link',
+              description: 'Gerando symlinks dos relatórios'
             }, {
               command: 'password',
               description: 'Definindo senha do admin',

scripts/build

@@ -10,13 +10,14 @@ sed -i.bak 's/APP_ENV=local/APP_ENV=production/g' .env.example && rm .env.exampl
 sed -i.bak 's/APP_DEBUG=true/APP_DEBUG=false/g' .env.example && rm .env.example.bak
 sed -i.bak 's/DB_HOST=postgres/DB_HOST=localhost/g' .env.example && rm .env.example.bak
 composer install --no-dev --ignore-platform-reqs --optimize-autoloader
-git clone https://github.com/portabilis/i-educar-reports-package.git ieducar/modules/Reports
-rm -fR ieducar/modules/Reports/.git
-cd ieducar/modules/Reports/ReportSources
+git clone https://github.com/portabilis/i-educar-reports-package.git packages/portabilis/i-educar-reports-package
+composer install --plug-and-play --no-dev --ignore-platform-reqs --optimize-autoloader
+rm -fR packages/portabilis/i-educar-reports-package/.git
+cd packages/portabilis/i-educar-reports-package/ieducar/ReportSources
 echo "Compilando relatórios..."
-for line in $(ls -a | sort | grep .jrxml | sed -e "s/\.jrxml//"); do $(../../../../vendor/cossou/jasperphp/src/JasperStarter/bin/jasperstarter cp $line.jrxml -o $line); done
+for line in $(ls -a | sort | grep .jrxml | sed -e "s/\.jrxml//"); do $(../../../../../vendor/cossou/jasperphp/src/JasperStarter/bin/jasperstarter cp $line.jrxml -o $line); done
 echo "Fim da compilação"
-cd ../../../../../
+cd ../../../../../../
 tar -zcvf ieducar-${VERSION}.tar.gz ${BUILD_FOLDER}
 rm -fR ${BUILD_FOLDER}
 echo

src/Support/Installer.php

@@ -36,6 +36,7 @@ class Installer
     protected $commandsMap = [
         'key' => 'key:generate',
         'link' => 'legacy:link',
+        'reports-link' => 'community:reports:link',
         'migrate' => 'migrate --force',
         'password' => 'admin:password',
         'reports' => 'reports:install --no-compile',
@@ -193,11 +194,11 @@ protected function getConnection(): \PDO
     {
         $dsn = sprintf(
             'pgsql:host=%s;port=%s;dbname=%s;user=%s;password=%s',
-            getenv('DB_HOST'),
-            getenv('DB_PORT'),
-            getenv('DB_DATABASE'),
-            getenv('DB_USERNAME'),
-            getenv('DB_PASSWORD')
+            env('DB_HOST'),
+            env('DB_PORT'),
+            env('DB_DATABASE'),
+            env('DB_USERNAME'),
+            env('DB_PASSWORD')
         );
 
         return new \PDO($dsn);