Fix broken installation commands when the folder has whitespaces

getkirby · Feb 6, 2024 · 31c0241 · 31c0241
1 parent 679a616
commit 31c0241
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/commands/download.php b/commands/download.php
@@ -20,6 +20,7 @@
 	'command' => static function (CLI $cli): void {
 		$client   = new Client();
 		$progress = $cli->progress()->total(100);
+		$file     = $cli->arg('file');
 
 		try {
 			$response = $client->get($cli->arg('url'), [
@@ -35,7 +36,7 @@
 				},
 			]);
 
-			file_put_contents($cli->arg('file'), (string)$response->getBody());
+			file_put_contents($file, (string)$response->getBody());
 		} catch (Throwable $e) {
 			throw new Exception('The file could not be downloaded. (Status: ' . $e->getResponse()->getStatusCode() . ')');
 		}

diff --git a/commands/unzip.php b/commands/unzip.php
@@ -29,7 +29,7 @@
 		}
 
 		// extract the zip file
-		exec('unzip ' . $file . ' -d ' . $to);
+		exec('unzip ' . escapeshellarg($file) . ' -d ' . escapeshellarg($to));
 
 		$to = realpath($to);
 
@@ -40,7 +40,7 @@
 			throw new Exception('The archive directory could not be found');
 		}
 
-		exec('mv ' . $to . '/*/{.[!.],}* ' . $to . '/');
-		exec('rm -rf ' . $archive);
+		exec('mv ' . escapeshellarg($to) . '/*/{.[!.],}* ' . escapeshellarg($to) . '/');
+		exec('rm -rf ' . escapeshellarg($archive));
 	}
 ];