From 9a0da88d6c38e9ff5d27e2dcd8bb8cabea7b4fa9 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 19 Mar 2010 11:54:19 +0000 Subject: [PATCH] Better diversion arrangements --- get-settings | 3 +++ inews.INO | 7 ++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/get-settings b/get-settings index 4226b29..5c71c46 100644 --- a/get-settings +++ b/get-settings @@ -4,8 +4,11 @@ paskeys='KEYSUBMIT KEYSTUMP2WEB KEYWEB2STUMP' pas="$paskeys" for k in $pas; do eval "$k=''"; export $k; done +DIVERTPOSTINGS='' + . settings export GROUP ABBREV INFOHEADER MODEMAIL GROUPURL REJECTIONSLIST +export DIVERTPOSTINGS . ../global-settings export ROOTBASEDIR CGIBASEURL DOMAIN SLIMYDOMAIN OURUSER ADMIN diff --git a/inews.INO b/inews.INO index 1b8892f..99c750a 100755 --- a/inews.INO +++ b/inews.INO @@ -1,9 +1,6 @@ #!/bin/sh set -e -#real=false -real=true - export NNTPSERVER=nnrp.chiark.greenend.org.uk export NNTPAUTH='md5cookie1way chiark' @@ -17,11 +14,11 @@ set +e output=` set -e exec 2>&1 - if $real; then + if [ x%DIVERTPOSTINGS% = x ]; then inews -h -Q -R <$tf else (set -e - echo "Newsgroups: %TESTGROUP%" + echo "Newsgroups: %DIVERTPOSTINGS%" sed 's/^Newsgroups:/X-Would-Newsgroups:/' $tf) | inews -h fi ` -- 2.30.2