Fixed Nginx installation problems, cleaned up total 0 output and upda…

…ted readme and updates accordingly.

cli/Valet/Nginx.php

@@ -46,6 +46,7 @@ function install()
         $this->files->ensureDirExists('/etc/nginx/sites-available');
         $this->files->ensureDirExists('/etc/nginx/sites-enabled');
 
+        $this->stop();
         $this->installConfiguration();
         $this->installServer();
         $this->installNginxDirectory();
@@ -141,11 +142,7 @@ function restart()
      */
     function stop()
     {
-        try {
-            $this->sm->stop('nginx');
-        } catch (DomainException $e) {
-            // Ignore if nginx is not installed
-        }
+        $this->sm->stop('nginx');
     }
 
     /**

cli/Valet/Valet.php

@@ -16,7 +16,7 @@ class Valet
 
     var $valetBin = '/usr/local/bin/valet';
     var $sudoers  = '/etc/sudoers.d/valet';
-    var $github   = 'https://api.github.com/repos/cpriego/valet-ubuntu/releases/latest';
+    var $github   = 'https://api.github.com/repos/cpriego/valet-linux/releases/latest';
 
     /**
      * Create a new Valet instance.

cli/valet.php

@@ -18,7 +18,7 @@
  */
 Container::setInstance(new Container);
 
-$version = '2.0.3';
+$version = '2.0.4';
 
 $app = new Application('Valet', $version);
 
@@ -41,7 +41,6 @@
 $app->command('install [--ignore-selinux]', function ($ignoreSELinux) {
     Requirements::setIgnoreSELinux($ignoreSELinux)->check();
     Configuration::install();
-    Nginx::stop();
     Nginx::install();
     PhpFpm::install();
     DnsMasq::install();
@@ -113,7 +112,7 @@
  * Display all of the registered symbolic links.
  */
 $app->command('links', function () {
-    passthru('ls -la '.VALET_HOME_PATH.'/Sites');
+    passthru('ls -lh '.VALET_HOME_PATH.'/Sites');
 })->descriptions('Display all of the registered Valet links');
 
 /**

readme.md

@@ -38,14 +38,14 @@ After upgrading, it may be necessary to re-park or re-link your sites.
 
 ## Requirements
  - PHP >= 5.6
+ - Ubuntu (and derivates) OR Fedora (and derivates)
  - PHP Packages: `php*-cli php*-curl php*-mbstring php*-mcrypt php*-xml php*-zip`
  - Optional PHP Packages: `php*-sqlite3 php*-mysql php*-pgsql`
 
 **Replace the star _(*)_ with your php version**
 
 ### Ubuntu
  - Ubuntu >= 14.04
- - Ubuntu 
  - Dependencies: `sudo apt-get install libnss3-tools jq xsel`
 
 Regarding the **supported** Ubuntu version:

tests/NginxTest.php

@@ -31,7 +31,6 @@ public function test_install_calls_the_right_methods()
         $site = Mockery::mock(Site::class);
         $conf = Mockery::mock(Configuration::class);
         $cli = Mockery::mock(CommandLine::class);
-        $sm = Mockery::mock(ServiceManager::class);
 
         $files = Mockery::mock(Filesystem::class);
         $files->shouldReceive('ensureDirExists')->with('/etc/nginx/sites-available')->once();
@@ -40,6 +39,9 @@ public function test_install_calls_the_right_methods()
         $pm = Mockery::mock(PackageManager::class);
         $pm->shouldReceive('ensureInstalled')->with('nginx')->once();
 
+        $sm = Mockery::mock(ServiceManager::class);
+        $sm->shouldReceive('stop')->with('nginx')->once();
+
         $nginx = Mockery::mock(Nginx::class.'[installConfiguration,installServer,installNginxDirectory]', [$pm, $sm, $cli, $files, $conf, $site]);
 
         $nginx->shouldReceive('installConfiguration')->once();