...

Pushword · Nov 16, 2021 · 1fff47f · 1fff47f
1 parent 1863373
commit 1fff47f
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 3 deletions.
diff --git a/packages/admin-block-editor/install.php b/packages/admin-block-editor/install.php
@@ -4,7 +4,7 @@
  * Execute via Pushword\Installer\PostInstall::postUpdateCommand
  */
 
-if (! \Pushword\Installer\PostInstall::isRoot()) {
+if (!isset($postInstallRunning)) return;if (! \Pushword\Installer\PostInstall::isRoot()) {
     throw new Exception('installer mus be run from root');
 }
 

diff --git a/packages/admin/src/Installer/install.php b/packages/admin/src/Installer/install.php
@@ -3,6 +3,9 @@
 /**
  * Execute via Pushword\Installer\PostInstall::postUpdateCommand.
  */
+if (! isset($postInstallRunning)) {
+    return;
+}
 if (! \Pushword\Installer\PostInstall::isRoot()) {
     throw new Exception('installer mus be run from root');
 }

diff --git a/packages/conversation/src/Installer/install.php b/packages/conversation/src/Installer/install.php
@@ -3,6 +3,9 @@
 /**
  * Execute via Pushword\Installer\PostInstall::postUpdateCommand.
  */
+if (! isset($postInstallRunning)) {
+    return;
+}
 if (! \Pushword\Installer\PostInstall::isRoot()) {
     throw new Exception('installer mus be run from root');
 }

diff --git a/packages/core/src/Installer/install.php b/packages/core/src/Installer/install.php
@@ -3,7 +3,10 @@
 /**
  * Execute via Pushword\Installer\PostInstall::postUpdateCommand.
  */
-if (! file_exists('vendor')) {
+if (! isset($postInstallRunning)) {
+    return;
+}
+if (! \Pushword\Installer\PostInstall::isRoot()) {
     throw new Exception('installer mus be run from root');
 }
 

diff --git a/packages/installer/src/PostInstall.php b/packages/installer/src/PostInstall.php
@@ -20,6 +20,7 @@ public static function run(): void //Event $event
         foreach ($packages as $package) {
             if (! file_exists('var/installer/'.md5($package)) && file_exists($installer = 'vendor/pushword/'.$package.'/src/Installer/install.php')) {
                 echo '~ Executing '.$package.' post update command install action.'.\chr(10);
+                $postInstallRunning = true;
                 include $installer;
 
                 self::dumpFile('var/installer/'.md5($package), 'done');

diff --git a/packages/page-scanner/src/Installer/install.php b/packages/page-scanner/src/Installer/install.php
@@ -3,6 +3,9 @@
 /**
  * Execute via Pushword\Installer\PostInstall::postUpdateCommand.
  */
+if (! isset($postInstallRunning)) {
+    return;
+}
 if (! \Pushword\Installer\PostInstall::isRoot()) {
     throw new Exception('installer mus be run from root');
 }

diff --git a/packages/static-generator/install.php b/packages/static-generator/install.php
@@ -4,7 +4,7 @@
  * Execute via Pushword\Installer\PostInstall::postUpdateCommand
  */
 
-if (! \Pushword\Installer\PostInstall::isRoot()) {
+if (!isset($postInstallRunning)) return;if (! \Pushword\Installer\PostInstall::isRoot()) {
     throw new Exception('installer mus be run from root');
 }
 

diff --git a/packages/template-editor/src/install.php b/packages/template-editor/src/install.php
@@ -3,6 +3,9 @@
 /**
  * Execute via Pushword\Installer\PostInstall::postUpdateCommand.
  */
+if (! isset($postInstallRunning)) {
+    return;
+}
 if (! \Pushword\Installer\PostInstall::isRoot()) {
     throw new Exception('installer mus be run from root');
 }

diff --git a/packages/version/src/Installer/install.php b/packages/version/src/Installer/install.php
@@ -3,6 +3,9 @@
 /**
  * Execute via Pushword\Installer\PostInstall::postUpdateCommand.
  */
+if (! isset($postInstallRunning)) {
+    return;
+}
 if (! \Pushword\Installer\PostInstall::isRoot()) {
     throw new Exception('installer mus be run from root');
 }