update some http urls to https

diff --git a/commands.py b/commands.py
index eec69e7f416dd0d085f60e8b08dda26e1ae3b57b..59f9354254e05a470dea89d25bf1328b01d1f871 100755 (executable)
--- a/commands.py
+++ b/commands.py
@@ -43,7 +43,7 @@ def karmadelq(bot, cmd, nick, conn, public, karma):
 # help - provides the URL of the help file
 def helpq(bot, cmd, nick, conn, public):
     bot.automsg(public,nick,
-                "For help see http://www.chiark.greenend.org.uk/~matthewv/irc/servus.html")
+                "For help see https://www.chiark.greenend.org.uk/~matthewv/irc/servus.html")
 
 
 # query bot status

diff --git a/pull-and-update.sh b/pull-and-update.sh
index f8068981f2105a921720ab11292f46ee4e9089f8..5d28b0defed372c1c1b433ca4ed4edea8a2f02de 100755 (executable)
--- a/pull-and-update.sh
+++ b/pull-and-update.sh
@@ -1,4 +1,4 @@
 #!/bin/bash -e
 
-git-pull -v
-git-update-server-info
+git pull -v
+git update-server-info

diff --git a/servus.html b/servus.html
index e8234106876423ed3b2a38d725bbeb84978d18da..3c7685b369498b7ea13658298e52c65ed05d850b 100644 (file)
--- a/servus.html
+++ b/servus.html
@@ -25,8 +25,8 @@ span.code {font-family: courier, monospace}
 class="code">#chiark</span>. This page documents the available
 commands.<br /> You can get a copy of the source code by running <span
 class="code">git-clone <a
-href="http://www.chiark.greenend.org.uk/~matthewv/irc/.git">http://www.chiark.greenend.org.uk/~matthewv/irc/.git</a></span>,
-or via <span class="code">gitweb</span> at <a href="http://www.chiark.greenend.org.uk/ucgi/~matthewv/git/irc.git/">http://www.chiark.greenend.org.uk/ucgi/~matthewv/git/irc.git/</a>.</p>
+href="https://www.chiark.greenend.org.uk/~matthewv/irc/.git">http://www.chiark.greenend.org.uk/~matthewv/irc/.git</a></span>,
+or via <span class="code">gitweb</span> at <a href="https://www.chiark.greenend.org.uk/ucgi/~matthewv/git/irc.git/">https://www.chiark.greenend.org.uk/ucgi/~matthewv/git/irc.git/</a>.</p>
 
 <h2>Invocation</h2>
 <p>Servus may be invoked in-channel using either <span
@@ -92,7 +92,7 @@ The first form will search for <span class="code">text</span> in the
 <span class="code">currency curr1 as curr2</span><br />
 This will give the first currency in terms of the second
       currency. Currencies must be specified using their standard <a
-       href="http://en.wikipedia.org/wiki/ISO_4217">currency
+       href="https://en.wikipedia.org/wiki/ISO_4217">currency
        code</a>. The currency conversion is performed using xe.com's
       currency converter.</p>
 
@@ -131,7 +131,7 @@ of Servus stating who invoked it by adding "(but nick is their secret
 admirer)" to the end of the flirt. Further suggestions for flirts
 should be submitted by email; a list of current flirts may be found
 online at <a
-href="flirts">http://www.chiark.greenend.org.uk/~matthewv/irc/flirts</a>.</p>
+href="flirts">https://www.chiark.greenend.org.uk/~matthewv/irc/flirts</a>.</p>
 
 <h3><a name="google">google</a></h3>
 <p>This command returns (either on-channel or by <span
@@ -226,7 +226,7 @@ is invoked by <span class="code">/msg</span>, there is a 10% chance
 of Servus stating who invoked it by adding "(while nick watches)" to
 the end of the slash. Further suggestions for slashes should be
 submitted by email; a list of current slashes may be found online at <a
-href="slashes">http://www.chiark.greenend.org.uk/~matthewv/irc/slashes</a>.</p>
+href="slashes">https://www.chiark.greenend.org.uk/~matthewv/irc/slashes</a>.</p>
 
 <h3><a name="trout">trout</a></h3>
 <p>The syntax is:<br /> <span
@@ -238,7 +238,7 @@ is invoked by <span class="code">/msg</span>, there is a 10% chance
 of Servus stating who invoked it by adding "(at the instigation of
 nick)" to the end of the trout. Further suggestions for trouts should
 be submitted by email; a list of current trouts may be found online at
-<a href="trouts">http://www.chiark.greenend.org.uk/~matthewv/irc/trouts</a>.</p>
+<a href="trouts">https://www.chiark.greenend.org.uk/~matthewv/irc/trouts</a>.</p>
 
 <h3><a name="twit">twit</a></h3>
 <p>The syntax is:<br /><span