Merge pull request #75 from ancarda/master

Seldaek · web-flow · commit e342ef106422 · 2020-09-04T14:20:24.000+02:00
Fix usage line in help page to be path to program
diff --git a/bin/jsonlint b/bin/jsonlint
@@ -37,7 +37,7 @@ if (isset($_SERVER['argc']) && $_SERVER['argc'] > 1) {
             $quiet = true;
         } else {
             if ($arg == '-h' || $arg == '--help') {
-                showUsage();
+                showUsage($_SERVER['argv'][0]);
             } else {
                 $files[] = $arg;
             }
@@ -106,9 +106,9 @@ function lintFile($file, $quiet = false)
 }
 
 // usage text function
-function showUsage()
+function showUsage($programPath)
 {
-    echo 'Usage: jsonlint file [options]'.PHP_EOL;
+    echo 'Usage: '.$programPath.' file [options]'.PHP_EOL;
     echo PHP_EOL;
     echo 'Options:'.PHP_EOL;
     echo '  -q, --quiet     Cause jsonlint to be quiet when no errors are found'.PHP_EOL;

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ if (isset($_SERVER['argc']) && $_SERVER['argc'] > 1) {`
`37`	`37`	`$quiet = true;`
`38`	`38`	`} else {`
`39`	`39`	`if ($arg == '-h' \|\| $arg == '--help') {`
`40`		`- showUsage();`
	`40`	`+ showUsage($_SERVER['argv'][0]);`
`41`	`41`	`} else {`
`42`	`42`	`$files[] = $arg;`
`43`	`43`	`}`
`@@ -106,9 +106,9 @@ function lintFile($file, $quiet = false)`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`// usage text function`
`109`		`-function showUsage()`
	`109`	`+function showUsage($programPath)`
`110`	`110`	`{`
`111`		`- echo 'Usage: jsonlint file [options]'.PHP_EOL;`
	`111`	`+ echo 'Usage: '.$programPath.' file [options]'.PHP_EOL;`
`112`	`112`	`echo PHP_EOL;`
`113`	`113`	`echo 'Options:'.PHP_EOL;`
`114`	`114`	`echo ' -q, --quiet Cause jsonlint to be quiet when no errors are found'.PHP_EOL;`