From 51b8f97827bfedc9555ffa5ff417326977b88733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20P=C3=A9rez=20Crespo?= <jaime.perez@uninett.no>
Date: Wed, 31 Oct 2012 11:12:16 +0000
Subject: [PATCH] Fix for issue #519, metarefresh --help message improved.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@3200 44740490-163a-0410-bde0-09ae8108e29a
---
modules/metarefresh/bin/metarefresh.php | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/modules/metarefresh/bin/metarefresh.php b/modules/metarefresh/bin/metarefresh.php
index 08fe926f8..4af3dfb46 100755
--- a/modules/metarefresh/bin/metarefresh.php
+++ b/modules/metarefresh/bin/metarefresh.php
@@ -95,7 +95,7 @@ foreach($argv as $a) {
echo('Please run `' . $progName . ' --help` for usage information.' . "\n");
exit(1);
}
- $outputDir = $baseDir . $v;
+ $outputDir = $baseDir . ($v[0] == '/' ? $v : '/' . $v);
break;
case '--stdout':
$toStdOut = TRUE;
@@ -145,13 +145,15 @@ function printHelp() {
echo('be added to the metadata files in metadata/.' . "\n");
echo("\n");
echo('Options:' . "\n");
- echo(' --validate-fingerprint=<FINGERPRINT>' . "\n");
+ echo(' --validate-fingerprint=<FINGERPRINT>' . "\n");
echo(' Check the signature of the metadata,' . "\n");
echo(' and check the fingerprint of the' . "\n");
echo(' certificate against <FINGERPRINT>.' . "\n");
echo(' -h, --help Print this help.' . "\n");
echo(' -o=<DIR>, --out-dir=<DIR> Write the output to this directory. The' . "\n");
- echo(' default directory is metadata-generated/' . "\n");
+ echo(' default directory is metadata-generated/.' . "\n");
+ echo(' Path will be relative to the simpleSAMLphp' . "\n");
+ echo(' base directory.' . "\n");
echo(' -s, --stdout Write the output to stdout instead of' . "\n");
echo(' seperate files in the output directory.' . "\n");
echo("\n");
--
GitLab