Fix minor issues with systemd

Author: jmarcher

cli/Valet/PhpFpm.php

@@ -204,13 +204,21 @@ public function getVersion($real = false)
      *
      * @return string
      */
-    public function fpmServiceName()
+    public function fpmServiceName($serviceName = null)
     {
-        $service = 'php' . $this->version . '-fpm';
+        if($serviceName === null){
+            $service = "php{$this->version}-fpm";
+        }else{
+            $service = $serviceName;
+        }
         $status = $this->sm->status($service);
-
         if (strpos($status, 'not-found') || strpos($status, 'not be found')) {
-            return new DomainException("Unable to determine PHP service name.");
+                $secondTry = $this->fpmServiceName("php-fpm{$this->version}");
+                if($secondTry instanceof DomainException){
+                    return new DomainException("Unable to determine PHP service name.");
+                }
+
+                return $secondTry;
         }
 
         return $service;
@@ -226,6 +234,7 @@ public function fpmConfigPath()
         return collect([
             '/etc/php/' . $this->version . '/fpm/pool.d', // Ubuntu
             '/etc/php' . $this->version . '/fpm/pool.d', // Ubuntu
+            '/etc/php' . $this->version . '/php-fpm.d', // Manjaro
             '/etc/php-fpm.d', // Fedora
             '/etc/php/php-fpm.d', // Arch
             '/etc/php7/fpm/php-fpm.d', // openSUSE

cli/Valet/ServiceManagers/Systemd.php

@@ -218,7 +218,7 @@ public function getRealService($service)
     {
         return collect($service)->first(
             function ($service) {
-                return strpos($this->cli->run("systemctl status {$service} | grep Loaded"), 'Loaded: loaded');
+                return strpos($this->cli->run("systemctl status {$service} | grep Loaded"), 'Loaded: loaded') >= 0;
             },
             function () {
                 throw new DomainException("Unable to determine service name.");