From 2a96f9f4d71ce04178b182ea346e9daecb52b10c Mon Sep 17 00:00:00 2001
From: Richard McDaniel <richard.lee.mcdaniel@gmail.com>
Date: Tue, 23 Apr 2024 18:40:25 +0000
Subject: [PATCH] Update install command

---
 app/Console/InstallCommand.php | 23 ++++++++++++++---------
 docker/Dockerfile              | 24 ++++++++++++------------
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/app/Console/InstallCommand.php b/app/Console/InstallCommand.php
index 295f685..aaa2fff 100644
--- a/app/Console/InstallCommand.php
+++ b/app/Console/InstallCommand.php
@@ -3,6 +3,7 @@
 namespace Waterline\Console;
 
 use Illuminate\Console\Command;
+use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Str;
 
 class InstallCommand extends Command
@@ -36,17 +37,21 @@ protected function registerWaterlineServiceProvider()
     {
         $namespace = Str::replaceLast('\\', '', $this->laravel->getNamespace());
 
-        $appConfig = file_get_contents(config_path('app.php'));
+        if (file_exists($this->laravel->bootstrapPath('providers.php'))) {
+            ServiceProvider::addProviderToBootstrapFile("{$namespace}\\Providers\\WaterlineServiceProvider");
+        } else {
+            $appConfig = file_get_contents(config_path('app.php'));
 
-        if (Str::contains($appConfig, $namespace.'\\Providers\\WaterlineServiceProvider::class')) {
-            return;
-        }
+            if (Str::contains($appConfig, $namespace.'\\Providers\\WaterlineServiceProvider::class')) {
+                return;
+            }
 
-        file_put_contents(config_path('app.php'), str_replace(
-            "{$namespace}\\Providers\EventServiceProvider::class,".PHP_EOL,
-            "{$namespace}\\Providers\EventServiceProvider::class,".PHP_EOL."        {$namespace}\Providers\WaterlineServiceProvider::class,".PHP_EOL,
-            $appConfig
-        ));
+            file_put_contents(config_path('app.php'), str_replace(
+                "{$namespace}\\Providers\EventServiceProvider::class,".PHP_EOL,
+                "{$namespace}\\Providers\EventServiceProvider::class,".PHP_EOL."        {$namespace}\Providers\WaterlineServiceProvider::class,".PHP_EOL,
+                $appConfig
+            ));
+        }
 
         file_put_contents(app_path('Providers/WaterlineServiceProvider.php'), str_replace(
             "namespace App\Providers;",
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 176cc4a..77e7614 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -40,18 +40,18 @@ RUN apt-get update \
     && apt-get install -y mysql-client \
     && apt-get install -y postgresql-client-$POSTGRES_VERSION \
     && apt-get install -y unixodbc-dev unixodbc odbcinst \
-    && cd /tmp \
-    && curl -O https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/msodbcsql17/msodbcsql17_17.10.1.1-1_amd64.deb \
-    && curl -O https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/mssql-tools/mssql-tools_17.10.1.1-1_amd64.deb \
-    && ACCEPT_EULA=Y dpkg -i msodbcsql17_17.10.1.1-1_amd64.deb \
-    && ACCEPT_EULA=Y dpkg -i mssql-tools_17.10.1.1-1_amd64.deb \
-    && apt-get install -f \
-    && pecl update-channels \
-    && pecl install sqlsrv \
-    && pecl install pdo_sqlsrv \
-    && echo "extension=sqlsrv.so" | tee -a /etc/php/8.2/mods-available/sqlsrv.ini \
-    && echo "extension=pdo_sqlsrv.so" | tee -a /etc/php/8.2/mods-available/pdo_sqlsrv.ini \
-    && phpenmod sqlsrv pdo_sqlsrv \
+    # && cd /tmp \
+    # && curl -O https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/msodbcsql17/msodbcsql17_17.10.1.1-1_amd64.deb \
+    # && curl -O https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/mssql-tools/mssql-tools_17.10.1.1-1_amd64.deb \
+    # && ACCEPT_EULA=Y dpkg -i msodbcsql17_17.10.1.1-1_amd64.deb \
+    # && ACCEPT_EULA=Y dpkg -i mssql-tools_17.10.1.1-1_amd64.deb \
+    # && apt-get install -f \
+    # && pecl update-channels \
+    # && pecl install sqlsrv \
+    # && pecl install pdo_sqlsrv \
+    # && echo "extension=sqlsrv.so" | tee -a /etc/php/8.2/mods-available/sqlsrv.ini \
+    # && echo "extension=pdo_sqlsrv.so" | tee -a /etc/php/8.2/mods-available/pdo_sqlsrv.ini \
+    # && phpenmod sqlsrv pdo_sqlsrv \
     && apt-get -y autoremove \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*