Allow pkgsubmit to accept any tar* file

Instead of restricting to gz and bz2, allow just plain tar and any other
format tar can understand to be uploaded. I make the mistake all the time of
forgetting to pass -z to tar when making something to upload, and there is
no real reason to exclude plain tar files.

Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 3 insertions, 5 deletions

diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php
index 801348b..ccf66c1 100644
--- a/web/html/pkgsubmit.php
+++ b/web/html/pkgsubmit.php
@@ -47,11 +47,9 @@ if ($_COOKIE["AURSID"]) {
 					$error = __("Could not change directory to %s.",
 						array(UPLOAD_DIR . $tempdir));
 				} else {
-					exec("/bin/sh -c 'tar xzf " . $_FILES["pfile"]["tmp_name"] . "'", $trash, $retval);
-					if ($retval) {
-						exec("/bin/sh -c 'tar xjf " . $_FILES["pfile"]["tmp_name"] . "'", $trash, $retval);
-					}
-					if ($retval) {
+					# try using general tar. it should take .gz, .bz2, and plain .tar
+					exec("/bin/sh -c 'tar xf ".$upload_file."'", $trash, $retval);
+					if (!$retval) {
 						$error = __("Unknown file format for uploaded file.");
 					}
 				}