switched to general logic that branches locally depending on shell type.

now bash and csh derivatives should work.
This commit is contained in:
Philip Eisenlohr 2012-10-18 09:55:54 +00:00
parent dd5f453994
commit 0e33725395
1 changed files with 65 additions and 60 deletions

View File

@ -3,9 +3,9 @@
import os,sys,string,re
from optparse import OptionParser
validShells = {\
validShellRC = {\
'bash':['.bashrc','.bash_profile','.bash_login','.profile','new'],
'csh': ['.cshrc'],
'csh': ['.cshrc','new'],
}
env_order = ['DAMASK_ROOT','DAMASK_BIN','PATH','PYTHONPATH','LD_LIBRARY_PATH']
@ -62,7 +62,7 @@ Sets up your shell resource to be compatible with DAMASK.
parser.add_option("-s","--shell", type="string",
dest = "shell", \
help = "type of shell, e.g. "+', '.join(validShells.keys())+" [%default]")
help = "type of shell, e.g. "+', '.join(validShellRC.keys())+" [%default]")
parser.set_defaults(shell = 'bash')
@ -87,11 +87,10 @@ except:
theShell = options.shell.lower()
theHome = os.getenv('USERPROFILE') or os.getenv('HOME')
if theShell == 'bash':
for theRC in validShells[theShell]:
for theRC in validShellRC[theShell]:
if theRC == 'new' and not hitSomething:
print 'Could not find a file to store bash information, creating .bashrc in home directory'
theRC='.bashrc'
theRC = validShellRC[theShell][0]
print 'Could not find a file to store bash information, creating "%s" in home directory'%theRC
open(os.path.join(theHome,theRC), 'w').close()
thePath = os.path.join(theHome,theRC)
if os.path.exists(thePath):
@ -108,13 +107,17 @@ if theShell == 'bash':
for line in content:
for var in env_order:
m = re.search(r'^(.*? %s=)([^;]*)(.*)$'%var,line)
m = re.search(\
{\
'bash': r'^(.*? %s=)([^;]*)(.*)$'%var,
'csh': r'^(\s*setenv\s+%s\s+)([^;]*)(.*)$'%var
}[theShell],line)
if m:
n = re.search(r'(%s)'%var, line)
o = re.search(r'(#)', line)
if o:
if o.start() < n.start():
print 'skipped potential comment line, please check'
print 'skipped potential comment line, please check!'
continue
match[var] = True
items = m.group(2).split(':')
@ -149,13 +152,15 @@ if theShell == 'bash':
items = eval(piece['substitute'])
except:
pass
output.append('export %s=%s'%(var,':'.join(items)))
output.append({\
'bash':'export %s=%s'%(var,':'.join(items)),
'csh': 'setenv %s %s'%(var,':'.join(items)),
}[theShell])
rc = open(os.path.join(theHome,theRC),'w')
rc.write('\n'.join(output)+'\n')
rc.close()
elif theShell == 'csh':
print 'csh not supported yet...'
if not hitSomething: print 'no %s found..!'%(', '.join(validShells[theShell]))
if not hitSomething: print 'none of %s found..!'%(', '.join(validShellRC[theShell]))