itdominator
/
terminator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Support reading from alternate config files. Branch from Pavel Khlebovich. Closes LP#806424

This commit is contained in:
Chris Jones 2012-10-18 22:14:39 -07:00
parent 4516d991a5 9b15e3033e
commit 8b9bf56ec3
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
terminatorlib/config.py
View File

@ -431,6 +431,8 @@ class ConfigBase(Borg):
Borg.__init__(self, self.__class__.__name__) Borg.__init__(self, self.__class__.__name__)
self.prepare_attributes() self.prepare_attributes()
import optionparse
self.command_line_options = optionparse.options
self.load() self.load()
def prepare_attributes(self): def prepare_attributes(self):
@ -535,7 +537,10 @@ class ConfigBase(Borg):
dbg('ConfigBase::load: config already loaded') dbg('ConfigBase::load: config already loaded')
return return
filename = os.path.join(get_config_dir(), 'config') if not self.command_line_options.config:
self.command_line_options.config = os.path.join(get_config_dir(), 'config')
filename = self.command_line_options.config
dbg('looking for config file: %s' % filename) dbg('looking for config file: %s' % filename)
try: try:
configfile = open(filename, 'r') configfile = open(filename, 'r')
@ -631,7 +636,7 @@ class ConfigBase(Borg):
if not os.path.isdir(config_dir): if not os.path.isdir(config_dir):
os.makedirs(config_dir) os.makedirs(config_dir)
try: try:
parser.write(open(os.path.join(config_dir, 'config'), 'w')) parser.write(open(self.command_line_options.config, 'w'))
except Exception, ex: except Exception, ex:
err('ConfigBase::save: Unable to save config: %s' % ex) err('ConfigBase::save: Unable to save config: %s' % ex)

7
terminatorlib/optionparse.py
View File

@ -26,6 +26,8 @@ import config
import version import version
from translation import _ from translation import _
options = None
def execute_cb(option, opt, value, lparser): def execute_cb(option, opt, value, lparser):
"""Callback for use in parsing execute options""" """Callback for use in parsing execute options"""
assert value is None assert value is None
@ -40,7 +42,6 @@ def parse_options():
"""Parse the command line options""" """Parse the command line options"""
usage = "usage: %prog [options]" usage = "usage: %prog [options]"
configobj = config.Config()
parser = OptionParser(usage) parser = OptionParser(usage)
parser.add_option('-v', '--version', action='store_true', dest='version', parser.add_option('-v', '--version', action='store_true', dest='version',
@ -60,6 +61,8 @@ def parse_options():
'(see X man page)')) '(see X man page)'))
parser.add_option('-e', '--command', dest='command', parser.add_option('-e', '--command', dest='command',
help=_('Specify a command to execute inside the terminal')) help=_('Specify a command to execute inside the terminal'))
parser.add_option('-g', '--config', dest='config',
help=_('Specify a config file'))
parser.add_option('-x', '--execute', dest='execute', action='callback', parser.add_option('-x', '--execute', dest='execute', action='callback',
callback=execute_cb, callback=execute_cb,
help=_('Use the rest of the command line as a command to execute' help=_('Use the rest of the command line as a command to execute'
@ -89,6 +92,7 @@ icon for the window (by file or name)'))
parser.add_option(item, dest='dummy', action='store', parser.add_option(item, dest='dummy', action='store',
help=SUPPRESS_HELP) help=SUPPRESS_HELP)
global options
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
if len(args) != 0: if len(args) != 0:
parser.error('Additional unexpected arguments found: %s' % args) parser.error('Additional unexpected arguments found: %s' % args)
@ -125,6 +129,7 @@ icon for the window (by file or name)'))
if options.layout is None: if options.layout is None:
options.layout = 'default' options.layout = 'default'
configobj = config.Config()
if options.profile and options.profile not in configobj.list_profiles(): if options.profile and options.profile not in configobj.list_profiles():
options.profile = None options.profile = None