From 4b574b8513e7af8611888a61ce38dc6e1407f260 Mon Sep 17 00:00:00 2001
From: rperper <rperper@litespeedtech.com>
Date: Wed, 31 Oct 2018 14:42:42 -0400
Subject: [PATCH] Composer no test

---
 install/composer-no-test.sh |  6 ++++++
 install/install.py          | 31 +++++++++++++++++++++++++------
 2 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 install/composer-no-test.sh

diff --git a/install/composer-no-test.sh b/install/composer-no-test.sh
new file mode 100644
index 000000000..4225b03c6
--- /dev/null
+++ b/install/composer-no-test.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+#php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+php composer-setup.php
+php -r "unlink('composer-setup.php');"
+cp composer.phar /usr/bin/composer
diff --git a/install/install.py b/install/install.py
index ee3756add..aef9a49e9 100755
--- a/install/install.py
+++ b/install/install.py
@@ -2922,19 +2922,38 @@ milter_default_action = accept
 
     def setupPHPAndComposer(self):
         try:
+            if self.distro == ubuntu:
+                if not os.access('/usr/local/lsws/lsphp70/bin/php'):
+                    if os.access('/usr/local/lsws/lsphp70/bin/php7.0'):
+                        os.symlink('/usr/local/lsws/lsphp70/bin/php7.0', '/usr/local/lsws/lsphp70/bin/php')
+                if not os.access('/usr/local/lsws/lsphp71/bin/php'):
+                    if os.access('/usr/local/lsws/lsphp71/bin/php7.1'):
+                        os.symlink('/usr/local/lsws/lsphp71/bin/php7.1', '/usr/local/lsws/lsphp71/bin/php')
+                if not os.access('/usr/local/lsws/lsphp72/bin/php'):
+                    if os.access('/usr/local/lsws/lsphp72/bin/php7.2'):
+                        os.symlink('/usr/local/lsws/lsphp72/bin/php7.2', '/usr/local/lsws/lsphp72/bin/php')
+
             command = "cp /usr/local/lsws/lsphp71/bin/php /usr/bin/"
             res = subprocess.call(shlex.split(command))
 
             os.chdir(self.cwd)
 
-            command = "chmod +x composer.sh"
+            if self.distro == centos:
+                command = "chmod +x composer.sh"
+            else:
+                command = "chmod +x composer-no-test.sh"
+
             res = subprocess.call(shlex.split(command))
 
-            command = "./composer.sh"
+            if self.distro == centos:
+                command = "./composer.sh"
+            else:
+                command = "./composer-no-test.sh"
+
             res = subprocess.call(shlex.split(command))
 
         except OSError, msg:
-            logging.InstallLog.writeToFile(str(msg) + " [setupPHPAndComposer]")
+            self.stdOut('Setup PHP error: ' + str(msg) + " [setupPHPAndComposer]", 1, 1, os.EX_OSERR)
             return 0
 
     @staticmethod
@@ -3072,7 +3091,7 @@ milter_default_action = accept
                 writeToFile.close()
 
         except OSError, msg:
-            logging.InstallLog.writeToFile(str(msg) + " [enableDisableDNS]")
+            preFlightsChecks.stdOut('Error disabling DNS: ' + str(msg) + " [enableDisableDNS]", 1, 0)
             return 0
 
     @staticmethod
@@ -3098,7 +3117,7 @@ milter_default_action = accept
                 writeToFile.close()
 
         except OSError, msg:
-            logging.InstallLog.writeToFile(str(msg) + " [enableDisableEmail]")
+            preFlightsChecks.stdOut('Error disabling Email: ' + str(msg) + " [enableDisableEmail]", 1, 0)
             return 0
 
     @staticmethod
@@ -3124,7 +3143,7 @@ milter_default_action = accept
                 writeToFile.close()
 
         except OSError, msg:
-            logging.InstallLog.writeToFile(str(msg) + " [enableDisableEmail]")
+            preFlightsChecks.stdOut('Error disabling FTP: ' + str(msg) + " [enableDisableFTP]", 1, 0)
             return 0