Skip to content

Commit 5350638

Browse files
levkowetzlevkowetz
committed
Make all the scripts under ietf/bin/ set up the environment the same way.
 - Legacy-Id: 11639
1 parent b0880b3 commit 5350638

24 files changed

+154
-36
lines changed

‎ietf/bin/2016-05-25-collect-photos‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,13 @@ from collections import namedtuple
55
from PIL import Image
66

77
# boilerplate
8-
basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../"))
8+
basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
99
sys.path = [ basedir ] + sys.path
10-
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
10+
os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
11+
12+
virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py")
13+
if os.path.exists(virtualenv_activation):
14+
execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
1115

1216
import django
1317
django.setup()

‎ietf/bin/announce-header-change‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ import datetime
66
# boilerplate
77
basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
88
sys.path = [ basedir ] + sys.path
9-
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
9+
os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
10+
11+
virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py")
12+
if os.path.exists(virtualenv_activation):
13+
execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
1014

1115
import django
1216
django.setup()

‎ietf/bin/create-break-sessions‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,14 @@
44
#
55

66
import os, sys
7+
78
basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
89
sys.path = [ basedir ] + sys.path
9-
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
10+
os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
11+
12+
virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py")
13+
if os.path.exists(virtualenv_activation):
14+
execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
1015

1116
import django
1217
django.setup()

‎ietf/bin/create-charter-newrevisiondocevents‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,16 @@ version = "0.10"
77
program = os.path.basename(sys.argv[0])
88
progdir = os.path.dirname(sys.argv[0])
99

10-
# assume we're placed in ietf/bin/:
11-
sys.path = [progdir+"/../../"] + sys.path
10+
# boilerplate
11+
basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
12+
sys.path = [ basedir ] + sys.path
1213
os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
1314

15+
virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py")
16+
if os.path.exists(virtualenv_activation):
17+
execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
18+
19+
1420
# ----------------------------------------------------------------------
1521
def note(string):
1622
sys.stdout.write("%s\n" % (string))

‎ietf/bin/dump-draft-info‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,15 @@ version = "0.10"
77
program = os.path.basename(sys.argv[0])
88
progdir = os.path.dirname(sys.argv[0])
99

10-
sys.path = [progdir+"/../../"] + sys.path
10+
# boilerplate
11+
basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
12+
sys.path = [ basedir ] + sys.path
1113
os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
1214

15+
virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py")
16+
if os.path.exists(virtualenv_activation):
17+
execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
18+
1319
import django
1420
django.setup()
1521

‎ietf/bin/email-sync-discrepancies‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ import syslog
66
# boilerplate
77
basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
88
sys.path = [ basedir ] + sys.path
9-
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
9+
os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
10+
11+
virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py")
12+
if os.path.exists(virtualenv_activation):
13+
execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
1014

1115
from optparse import OptionParser
1216

‎ietf/bin/expire-ids‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,14 @@
33
import datetime, os
44
import syslog
55

6-
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
6+
# boilerplate
7+
basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
8+
sys.path = [ basedir ] + sys.path
9+
os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
10+
11+
virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py")
12+
if os.path.exists(virtualenv_activation):
13+
execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
714

815
syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER)
916

‎ietf/bin/expire-last-calls‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,14 @@
33
import datetime, os
44
import syslog
55

6-
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
6+
# boilerplate
7+
basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
8+
sys.path = [ basedir ] + sys.path
9+
os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
10+
11+
virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py")
12+
if os.path.exists(virtualenv_activation):
13+
execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
714

815
syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER)
916

‎ietf/bin/expire-submissions‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,14 @@
33
import datetime, os
44
import syslog
55

6-
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
7-
6+
# boilerplate
7+
basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
8+
sys.path = [ basedir ] + sys.path
9+
os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
10+
11+
virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py")
12+
if os.path.exists(virtualenv_activation):
13+
execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
814

915
syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER)
1016

‎ietf/bin/find-submission-confirmation-email-in-postfix-log‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,15 @@ version = "0.10"
77
program = os.path.basename(sys.argv[0])
88
progdir = os.path.dirname(sys.argv[0])
99

10-
# assume we're placed in ietf/bin/:
11-
sys.path = [progdir+"/../../"] + sys.path
10+
# boilerplate
11+
basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
12+
sys.path = [ basedir ] + sys.path
1213
os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
1314

15+
virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py")
16+
if os.path.exists(virtualenv_activation):
17+
execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
18+
1419
# ----------------------------------------------------------------------
1520
def note(string):
1621
sys.stdout.write("%s\n" % (string))

0 commit comments

Comments
 (0)