From 0c74381795e2c564f661f10910dd316b84198d88 Mon Sep 17 00:00:00 2001 From: Gustavo Arnosti Neves Date: Thu, 26 Jul 2018 06:43:25 -0300 Subject: [PATCH] v0.2.1 - usage function, better erron handling; a bit more option parsing; fix run with empty JSON options; added more excluded files; changed excluded parsing; a bit more error messages; added PHP hashbang and made file executable --- dir2json.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dir2json.php b/dir2json.php index 7e7fb5c..5895237 100755 --- a/dir2json.php +++ b/dir2json.php @@ -47,9 +47,9 @@ function dir2json($dir) } function usage($str='', $ret=2) { - if (!empty($str)) echo $str."\n"; - echo "For help, try:\n ./dir2json.php -h\n"; - exit($ret); + if (!empty($str)) echo $str."\n"; + echo "For help, try:\n ./dir2json.php -h\n"; + exit($ret); } // Long and short help opts @@ -99,19 +99,19 @@ $jsonOptions = empty($jsonOptions) ? 0 : constant($jsonOptions); // If we have a folder to read if (!is_dir($targetFolder)) { - if (empty($targetFolder)) $targetFolder = '(empty)'; - usage("Cannot open folder $targetFolder", 2); + if (empty($targetFolder)) $targetFolder = '(empty)'; + usage("Cannot open folder $targetFolder", 2); } // If we have an output file name if (empty($outputFile)) { - usage("Need a valid output file name (empty)", 3); + usage("Need a valid output file name (empty)", 3); } $arr = dir2json($targetFolder); $json = json_encode($arr, $jsonOptions); if (!file_put_contents($outputFile, $json)) { - usage("Could not save output file: $outputFile", 4); + usage("Could not save output file: $outputFile", 4); } exit(0);