@@ -10,9 +10,9 @@ import daemon
1010
1111class Umonitor (Screen ):
1212
13- def __init__ (self ,config_folder ):
13+ def __init__ (self ,config_folder , conf_fn ):
1414self .config_folder = config_folder
15- self .config_file = config_folder + "/umon.conf"
15+ self .config_file = config_folder + conf_fn
1616self .dry_run = False
1717self .connected = False
1818self ._exec_scripts = True
@@ -215,7 +215,7 @@ class Umonitor(Screen):
215215def exec_scripts (self ,profile_name ):
216216os .environ ["UMONITOR_PROFILE" ]= profile_name
217217for script in os .listdir (self .config_folder ):
218- if script != "umon2.conf" and not script .startswith ("." ):
218+ if script != conf_fn [ 1 :] and not script .startswith ("." ):
219219logging .info ("Running script %s" % script )
220220if self .dry_run :
221221continue
@@ -233,6 +233,7 @@ def main():
233233except KeyError :
234234raise Exception ("Need home environment variable to locate configuration file." )
235235config_folder = home + "/.config/umon"
236+ conf_fn = "/umon.conf"
236237
237238parser = argparse .ArgumentParser (description = "Manage monitor configuration." )
238239
@@ -249,7 +250,7 @@ def main():
249250parser .add_argument ("-f" ,"--force" ,dest = "force_load" ,action = "store_true" ,help = "disable all outputs even if they do not change during loading" )
250251parser .add_argument ("--daemonize" ,dest = "_daemonize" ,action = "store_true" ,help = "daemonize when listening to events" )
251252
252- umon = Umonitor (config_folder )
253+ umon = Umonitor (config_folder , conf_fn )
253254parser .parse_args (namespace = umon )
254255
255256logging_map = {
@@ -260,7 +261,7 @@ def main():
260261logger = logging .getLogger ()
261262logger .setLevel (logging_map [umon .verbose ])
262263
263- logging .debug ("Looking here for config file: %s" % config_folder + "/umon.conf" )
264+ logging .debug ("Looking here for config file: %s" % config_folder + conf_fn )
264265umon .run ()
265266
266267