Skip to content

Commit 0b336ba

Browse files
committed
Fix typo in path name
1 parent 01a136c commit 0b336ba

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

modules/root.lua

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ whatis("loads the ROOT environment")
88

99
prefix = "/opt/root-" .. version
1010

11-
prepend_path("MANPATH", joinPath(prefix, "/man:"))
12-
prepend_path("PATH", joinPath(prefix, "/bin:"))
11+
prepend_path("MANPATH", pathJoin(prefix, "/man:"))
12+
prepend_path("PATH", pathJoin(prefix, "/bin:"))
1313

14-
prepend_path("LD_LIBRARY_PATH", joinPath(prefix, "/lib"))
15-
prepend_path("DYLD_LIBRARY_PATH", joinPath(prefix, "/lib"))
14+
prepend_path("LD_LIBRARY_PATH", pathJoin(prefix, "/lib"))
15+
prepend_path("DYLD_LIBRARY_PATH", pathJoin(prefix, "/lib"))
1616

1717
prepend_path("CMAKE_PREFIX_PATH", prefix)
18-
prepend_path("PYTHONPATH", joinPath(prefix, "/lib"))
18+
prepend_path("PYTHONPATH", pathJoin(prefix, "/lib"))
1919

20-
setenv("JUPYTER_PATH", joinPath(prefix, "/etc/notebook"))
21-
setenv("LIBPATH", joinPath(prefix, "/lib"))
20+
setenv("JUPYTER_PATH", pathJoin(prefix, "/etc/notebook"))
21+
setenv("LIBPATH", pathJoin(prefix, "/lib"))
2222
setenv("ROOTSYS", prefix)
23-
setenv("SHLIB_PATH", joinPath(prefix, "/lib"))
23+
setenv("SHLIB_PATH", pathJoin(prefix, "/lib"))
2424

scripts/lmod_env.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def prefixify(value, prefix=None):
1919
Converts to a version that uses prefixes, if prefix given. Examples:
2020
2121
>>> prefixify('one two three ', ' ')
22-
'joinPath("one", prefix, "two", prefix, "three", prefix)'
22+
'pathJoin("one", prefix, "two", prefix, "three", prefix)'
2323
>>> prefixify(' ', ' ')
2424
'prefix'
2525
>>> prefixify('this', ' ')
@@ -33,7 +33,7 @@ def prefixify(value, prefix=None):
3333
vals = ['"{0}"'.format(v) for v in value.split(prefix)]
3434
vals = intersperse(vals, 'prefix')
3535
vals = [v for v in vals if v != '""']
36-
return 'joinPath({0})'.format(', '.join(vals))
36+
return 'pathJoin({0})'.format(', '.join(vals))
3737

3838
def make_changes(orig, curr, prefix = None):
3939
'''
@@ -85,7 +85,7 @@ class LmodEnv(cli.Application):
8585
'Save then load an environment, noting the changes.'
8686

8787
prefix = cli.SwitchAttr(['-p', '--prefix'], help='A common prefix to factor out')
88-
88+
8989
@cli.positional(cli.ExistingFile)
9090
def main(self, filename=None):
9191
if self.nested_command is not None:
@@ -114,7 +114,7 @@ def main(self, filename):
114114
class Load(cli.Application):
115115

116116
prefix = cli.SwitchAttr(['-p', '--prefix'], help='A common prefix to factor out')
117-
117+
118118
@cli.positional(cli.ExistingFile)
119119
def main(self, filename):
120120
with open(filename) as f:

0 commit comments

Comments
 (0)