Better diversion arrangements

diff --git a/get-settings b/get-settings
index 4226b295849c3d42ef847bdd71c9115fecc74977..5c71c460d44f6ad1a8fbaa54e71ca5446b34f626 100644 (file)
--- 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
 
 pas="$paskeys"
 for k in $pas; do eval "$k=''"; export $k; done
 

+DIVERTPOSTINGS=''
+

 . settings
 export GROUP ABBREV INFOHEADER MODEMAIL GROUPURL REJECTIONSLIST
 . settings
 export GROUP ABBREV INFOHEADER MODEMAIL GROUPURL REJECTIONSLIST

+export DIVERTPOSTINGS

 
 . ../global-settings
 export ROOTBASEDIR CGIBASEURL DOMAIN SLIMYDOMAIN OURUSER ADMIN
 
 . ../global-settings
 export ROOTBASEDIR CGIBASEURL DOMAIN SLIMYDOMAIN OURUSER ADMIN

diff --git a/inews.INO b/inews.INO
index 1b8892ff383818808a65b26d06bb3aee284d83ba..99c750a1ee926bbbfa4651a6b3fb20492798d713 100755 (executable)
--- a/inews.INO
+++ b/inews.INO
@@ -1,9 +1,6 @@
 #!/bin/sh
 set -e
 
 #!/bin/sh
 set -e
 

-#real=false
-real=true
-

 export NNTPSERVER=nnrp.chiark.greenend.org.uk
 export NNTPAUTH='md5cookie1way chiark'
 
 export NNTPSERVER=nnrp.chiark.greenend.org.uk
 export NNTPAUTH='md5cookie1way chiark'
 


@@ -17,11 +14,11 @@ set +e
 output=`
        set -e
        exec 2>&1
 output=`
        set -e
        exec 2>&1

-       if $real; then
+       if [ x%DIVERTPOSTINGS% = x ]; then

                inews -h -Q -R <$tf
        else
                (set -e
                inews -h -Q -R <$tf
        else
                (set -e

-                echo "Newsgroups: %TESTGROUP%"
+                echo "Newsgroups: %DIVERTPOSTINGS%"

                 sed 's/^Newsgroups:/X-Would-Newsgroups:/' $tf) | inews -h
        fi
 `
                 sed 's/^Newsgroups:/X-Would-Newsgroups:/' $tf) | inews -h
        fi
 `