[ BugFix ] Escape spaces in path (for real this time) (#88)

* extract space escaping, make idempotent

* escape spaces when ensuring hooks are executable

* escape spaces when generating bin_path

* use existing method to ensure hooks are executable

Author: ProjektGopher

app/Commands/Install.php

@@ -65,16 +65,14 @@ public function handle(): int
             $hook->install();
 
             if ($this->option('verbose')) {
-                $this->info("{$hook->name} git hook installed successfully.");
+                $this->info("Ensuring {$hook->name} hook is executable...");
             }
-        });
+            $hook->ensureExecutable();
 
-        if ($this->platform->isNotWindows()) {
             if ($this->option('verbose')) {
-                $this->info('Verifying hooks are executable...');
+                $this->info("{$hook->name} git hook installed successfully.");
             }
-            exec('chmod +x '.Platform::cwd('.git/hooks').'/*');
-        }
+        });
 
         $this->info('Git hooks installed successfully.');
 

app/Commands/Update.php

@@ -42,19 +42,16 @@ public function handle(): int
             }
 
             $hook->install();
-            $hook->ensureExecutable();
 
             if ($this->option('verbose')) {
-                $this->info("{$hook->name} git hook installed successfully.");
+                $this->info("Ensuring {$hook->name} hook is executable...");
             }
-        });
+            $hook->ensureExecutable();
 
-        if ($this->platform->isNotWindows()) {
             if ($this->option('verbose')) {
-                $this->info('Verifying hooks are executable...');
+                $this->info("{$hook->name} git hook installed successfully.");
             }
-            exec('chmod +x '.Platform::cwd('.git/hooks').'/*');
-        }
+        });
 
         $this->line('Git hooks updated successfully.');
 

app/Hook.php

@@ -91,7 +91,10 @@ public function enable(): void
     public function ensureExecutable(): void
     {
         if ((new Platform)->isNotWindows()) {
-            exec('chmod +x '.Platform::cwd(".git/hooks/{$this->hook}"));
+            $path = Platform::cwd(".git/hooks/{$this->hook}");
+            $path = Platform::escapeSpaces($path);
+
+            exec("chmod +x {$path}");
         }
     }
 

app/Platform.php

@@ -26,15 +26,18 @@ public static function temp_test_path(string $path = ''): string
 
     public static function normalizePath(string $path): string
     {
-        $path = str_replace(' ', '\\ ', $path);
-
         if ((new self)->isWindows()) {
             return str_replace('\\', '/', $path);
         }
 
         return $path;
     }
 
+    public static function escapeSpaces(string $path): string
+    {
+        return preg_replace('/(?<!\\\) /', '\\ ', $path);
+    }
+
     public static function getGlobalComposerHome(): string
     {
         return rtrim(shell_exec('composer -n global config home --quiet'), "\n");

app/Whisky.php

@@ -19,11 +19,13 @@ public static function base_path(string $path = ''): string
 
     public static function bin_path(): string
     {
-        return Platform::normalizePath(match (true) {
+        $path = Platform::normalizePath(match (true) {
             self::dogfooding() => Platform::cwd('whisky'),
             self::isRunningGlobally() => Platform::getGlobalComposerBinDir().'/whisky',
             default => Platform::cwd('vendor/bin/whisky'),
         });
+
+        return Platform::escapeSpaces($path);
     }
 
     public static function dogfooding(): bool