bin: Remove obsolete hard-coding of cjw44 and /home/httpd.

diff --git a/dinstall-riva b/dinstall-riva
index 86a9f915df2679915fac2371e1f68a2bada98f25..42651ac342e3a20c87c64a00ca63c19e8087f454 100755 (executable)
--- a/dinstall-riva
+++ b/dinstall-riva
@@ -1,7 +1,7 @@
 #! /bin/sh
 # The name is a deliberate echo of the "real" Debian dinstall; it moves
-# packages into http://riva.ucam.org/~cjw44/debian/, removes any old versions
-# of those packages there, and re-runs dpkg-myscan {packages,sources}.
+# packages into http://riva.ucam.org/~cjwatson/debian/, removes any old
+# versions of those packages there, and re-runs dpkg-myscan {packages,sources}.
 
 if [ $# -lt 2 ]; then
        echo "Usage: $0 package-name version-number" >&2
@@ -79,7 +79,7 @@ fi
 
 echo "Binaries in $BINARYDIR, sources in $SOURCEDIR"
 
-cd /home/httpd/users/$USER/debian
+cd "$HOME/public_html/debian"
 
 ERROR=
 if [ ! -d $BINARYDIR ]; then echo 'Binary dir not found.' >&2; ERROR=1; fi

diff --git a/get-corr b/get-corr
index 03f5f31ead04cfa650d09713b7dfd394829fb617..d7b889703e80026d152701a45dad458b97117cae 100755 (executable)
--- a/get-corr
+++ b/get-corr
@@ -40,7 +40,7 @@ foreach my $folder (@folders)
            }
            if ($scan)
            {
-               if ($line =~ /cjw44/)
+               if ($line =~ /cjw44|cjwatson/)
                {
                    $print_from = 1;
                    last;

diff --git a/m2n b/m2n
index 5d3786bf3628dc9da618d079292226b7667fde85..09af6c4baae2c1e736a8b4e397aa683689c613e1 100755 (executable)
--- a/m2n
+++ b/m2n
@@ -1,5 +1,5 @@
 #! /bin/sh
 
-/home/cjw44/bin/m2n.pl -n $1 -a cjw44@riva.ucam.org >> /home/cjw44/.m2n-errors 2>&1
+"$HOME/bin/m2n.pl" -n $1 -a cjwatson@riva.ucam.org >> "$HOME/.m2n-errors" 2>&1
 exit 0
 

diff --git a/m2n.pl b/m2n.pl
index 50fc3aac85dd760bcf8cfc473270a0b8b6bfa4bf..cfa5d8f0c7e987aadfa9fcef81fcf3972349988f 100755 (executable)
--- a/m2n.pl
+++ b/m2n.pl
@@ -60,7 +60,8 @@ mail2news(1).
 
 =head1 AUTHOR
 
-I<m2n> and this manual page were written by Colin Watson <cjw44@cam.ac.uk>.
+I<m2n> and this manual page were written by Colin Watson
+E<lt>cjwatson@flatline.org.ukE<gt>.
 
 =cut
 

diff --git a/mailtonews.wrapper b/mailtonews.wrapper
index 9b45b8a2bd1287b5d4cb1aac6b7c44e608f2b58d..c47c22a63730350c0a9e02a8b249f3753dc6f708 100755 (executable)
--- a/mailtonews.wrapper
+++ b/mailtonews.wrapper
@@ -1,3 +1,3 @@
 #! /bin/sh
-mailtonews >> /home/cjw44/.m2n-errors 2>&1
+mailtonews >> "$HOME/.m2n-errors" 2>&1
 exit 0