From cba2801c00cc8a5f1653cffb9d0ec435e2c3671e Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sun, 29 Dec 2002 19:13:43 +0000 Subject: [PATCH 1/1] bin: Remove obsolete hard-coding of cjw44 and /home/httpd. --- dinstall-riva | 6 +++--- get-corr | 2 +- m2n | 2 +- m2n.pl | 3 ++- mailtonews.wrapper | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dinstall-riva b/dinstall-riva index 86a9f91..42651ac 100755 --- 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 03f5f31..d7b8897 100755 --- 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 5d3786b..09af6c4 100755 --- 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 50fc3aa..cfa5d8f 100755 --- a/m2n.pl +++ b/m2n.pl @@ -60,7 +60,8 @@ mail2news(1). =head1 AUTHOR -I and this manual page were written by Colin Watson . +I and this manual page were written by Colin Watson +Ecjwatson@flatline.org.ukE. =cut diff --git a/mailtonews.wrapper b/mailtonews.wrapper index 9b45b8a..c47c22a 100755 --- 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 -- 2.30.2