From a1fda0b516cc4e85b7304838949df8fbe0044cf3 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sun, 1 Mar 2015 16:14:32 +0000 Subject: Standardize on --long-option instead of -long-option [[forum/refresh_and_setup]] indicates some confusion between --setup and -setup. Both work, but it's clearer if we stick to one in documentation and code. A 2012 commit to [[plugins/theme]] claims that "-setup" is required and "--setup" won't work, but I cannot find any evidence in ikiwiki's source code that this has ever been the case. --- t/basewiki_brokenlinks.t | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 't/basewiki_brokenlinks.t') diff --git a/t/basewiki_brokenlinks.t b/t/basewiki_brokenlinks.t index 74ddc61c5..249d625f6 100755 --- a/t/basewiki_brokenlinks.t +++ b/t/basewiki_brokenlinks.t @@ -8,14 +8,14 @@ ok(! system("make -s ikiwiki.out")); ok(! system("make underlay_install DESTDIR=`pwd`/t/tmp/install PREFIX=/usr >/dev/null")); foreach my $plugin ("", "listdirectives") { - ok(! system("LC_ALL=C perl -I. ./ikiwiki.out -rebuild -plugin brokenlinks ". + ok(! system("LC_ALL=C perl -I. ./ikiwiki.out --rebuild --plugin brokenlinks ". # always enabled because pages link to it conditionally, # which brokenlinks cannot handle properly - "-plugin smiley ". - ($plugin ? "-plugin $plugin " : ""). - "-underlaydir=t/tmp/install/usr/share/ikiwiki/basewiki ". - "-set underlaydirbase=t/tmp/install/usr/share/ikiwiki ". - "-templatedir=templates t/basewiki_brokenlinks t/tmp/out")); + "--plugin smiley ". + ($plugin ? "--plugin $plugin " : ""). + "--underlaydir=t/tmp/install/usr/share/ikiwiki/basewiki ". + "--set underlaydirbase=t/tmp/install/usr/share/ikiwiki ". + "--templatedir=templates t/basewiki_brokenlinks t/tmp/out")); my $result=`grep 'no broken links' t/tmp/out/index.html`; ok(length($result)); if (! length $result) { -- cgit v1.2.3