1
0
mirror of https://github.com/gryf/wicd.git synced 2026-01-01 11:32:27 +01:00

Get rid of unneeded "use_tray" variable being passed around in wicd-client.

Add some methods for executing multiple scripts to be use for global scripts later.
Remove some rogue extra whitespace in networking.py
This commit is contained in:
Dan O'Reilly
2009-02-27 00:13:00 -05:00
parent 7e18194c29
commit de8b8c11f8
3 changed files with 37 additions and 41 deletions

View File

@@ -57,7 +57,7 @@ ROUTE = 2
GKSUDO = 1
KDESU = 2
KTSUSS = 3
sudo_dict = {
_sudo_dict = {
AUTO : "",
GKSUDO : "gksudo",
KDESU : "kdesu",
@@ -171,9 +171,20 @@ def WriteLine(my_file, text):
""" write a line to a file """
my_file.write(text + "\n")
def ExecuteScript(script):
def ExecuteScripts(scripts_dir, verbose=False):
""" Execute every executable file in a given directory. """
for obj in os.listdir(scripts_dir):
obj = os.path.abspath(os.path.join(scripts_dir, obj))
if os.path.isfile(obj) and os.access(obj, os.X_OK):
ExecuteScript(os.path.abspath(obj), verbose=verbose)
def ExecuteScript(script, verbose=False):
""" Execute a command and send its output to the bit bucket. """
call("%s > /dev/null 2>&1" % script, shell=True)
if verbose:
print "Executing %s" % script
ret = call("%s > /dev/null 2>&1" % script, shell=True)
if verbose:
"%s returned %s" % (script, ret)
def ReadFile(filename):
""" read in a file and return it's contents as a string """
@@ -409,7 +420,7 @@ def get_sudo_cmd(msg, prog_num=0):
def choose_sudo_prog(prog_num=0):
""" Try to intelligently decide which graphical sudo program to use. """
if prog_num:
return find_path(sudo_dict[prog_num])
return find_path(_sudo_dict[prog_num])
desktop_env = detect_desktop_environment()
env_path = os.environ['PATH'].split(":")
paths = []
@@ -667,4 +678,4 @@ def timeout_add(time, func, milli=False):
else:
if not milli: time = time * 1000
return gobject.timeout_add(time, func)