1. Use the standard Python invocation #! line to get the interpreter

   from $PATH

2. Do no direct sys.path munging in this file.  Import the `paths'
   module, which is created during the configure process, and which
   performs all necessary path munging (and exports some useful
   variables too).

3. Remove RCS crud

4 files changed, 12 insertions, 22 deletions

diff --git a/scripts/mailcmd b/scripts/mailcmd
index 4120fb9c7..fa94dfeb5 100755
--- a/scripts/mailcmd
+++ b/scripts/mailcmd
@@ -1,4 +1,5 @@
-#! /usr/local/bin/python 
+#! /usr/bin/env python
+#
 # Copyright (C) 1998 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
@@ -22,13 +23,9 @@ of the target mailing list.
 
 Errors are redirected to logs/errors."""
 
-__version__ = "$Revision: 547 $"
-
 
 import sys
-
-sys.path.append('/home/mailman/mailman/modules')
-
+import paths
 import maillist, mm_utils
 
 try:
diff --git a/scripts/mailowner b/scripts/mailowner
index 914e3f6fc..51b724e35 100755
--- a/scripts/mailowner
+++ b/scripts/mailowner
@@ -1,4 +1,5 @@
-#! /usr/local/bin/python 
+#! /usr/bin/env python
+#
 # Copyright (C) 1998 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
@@ -22,12 +23,9 @@ This script gets called by the wrapper.
 Stdin is the mail message, and argv[1] is the name of the mailing list
 whose owner(s) to send mail to."""
 
-__version__ = "$Revision: 547 $"
-
 
 import sys
-sys.path.append('/home/mailman/mailman/modules')
-
+import paths
 import maillist, mm_message, mm_utils
 
 try:
diff --git a/scripts/owner b/scripts/owner
index 914e3f6fc..51b724e35 100755
--- a/scripts/owner
+++ b/scripts/owner
@@ -1,4 +1,5 @@
-#! /usr/local/bin/python 
+#! /usr/bin/env python
+#
 # Copyright (C) 1998 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
@@ -22,12 +23,9 @@ This script gets called by the wrapper.
 Stdin is the mail message, and argv[1] is the name of the mailing list
 whose owner(s) to send mail to."""
 
-__version__ = "$Revision: 547 $"
-
 
 import sys
-sys.path.append('/home/mailman/mailman/modules')
-
+import paths
 import maillist, mm_message, mm_utils
 
 try:
diff --git a/scripts/request b/scripts/request
index 4120fb9c7..fa94dfeb5 100755
--- a/scripts/request
+++ b/scripts/request
@@ -1,4 +1,5 @@
-#! /usr/local/bin/python 
+#! /usr/bin/env python
+#
 # Copyright (C) 1998 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
@@ -22,13 +23,9 @@ of the target mailing list.
 
 Errors are redirected to logs/errors."""
 
-__version__ = "$Revision: 547 $"
-
 
 import sys
-
-sys.path.append('/home/mailman/mailman/modules')
-
+import paths
 import maillist, mm_utils
 
 try: