Merge lp:~oreilldf/wicd/global-scripts into lp:wicd/1.6

[Dan O'Reilly]

[Dan O'Reilly (oreilldf)]

Adds global script directories to /etc/wicd.

[Robby Workman (rworkman)]

Untested here, but the logic and such looks correct.

review: Approve

[Adam Blackburn (adamblackburn)]

Looks fine.

review: Approve

[Robby Workman (rworkman)]

After testing with the changes, everything seems to work correctly (I just wrote some dummy scripts to echo into a logfile).

For the UI, I wonder if prepending the full path to the scripts directory would be workable; in other words, all the user would type is the actual *name* of the script (e.g. "whatever.sh" instead of "/etc/wicd/scripts/postconnect/whatever.sh")

[Dan O'Reilly (oreilldf)]

"For the UI, I wonder if prepending the full path to the scripts directory would be workable; in other words, all the user would type is the actual *name* of the script (e.g. "whatever.sh" instead of "/etc/wicd/scripts/postconnect/whatever.sh")"I wasn't planning on having a UI component at all. Any executable file in the script directory gets executed at the appropriate time.

[lp:~oreilldf/wicd/global-scripts]

303. By Dan O'Reilly on 2009-03-02

Merge.

304. By Dan O'Reilly on 2009-03-02

Don't provide separate options for pre/post/disconnect scripts. Just a parent scripts directory.

=== modified file 'in/wicd=wpath.py.in'
--- in/wicd=wpath.py.in	2009-01-24 03:13:27 +0000
+++ in/wicd=wpath.py.in	2009-02-27 05:40:19 +0000
@@ -26,6 +26,10 @@
 lib = '%LIB%'
 share = '%SHARE%'
 etc = '%ETC%'
+scripts = '%SCRIPTS%'
+disconnectscripts = '%DISCONNECTSCRIPTS%'
+preconnectscripts = '%PRECONNECTSCRIPTS%'
+postconnectscripts = '%POSTCONNECTSCRIPTS%'
 images = '%IMAGES%'
 encryption = '%ENCRYPTION%'
 bin = '%BIN%'
 
=== modified file 'setup.py'
--- setup.py	2009-02-21 06:37:38 +0000
+++ setup.py	2009-02-27 05:40:19 +0000
@@ -51,6 +51,10 @@
         ('lib=', None, 'set the lib directory'),
         ('share=', None, 'set the share directory'),
         ('etc=', None, 'set the etc directory'),
+        ('scripts=', None, 'set the global scripts directory'),
+        ('disconnectscripts=', None, 'set the global disconnect scripts directory'),
+        ('preconnectscripts=', None, 'set the global preconnect scripts directory'),
+        ('postconnectscripts=', None, 'set the global postconnect scripts directory'),
         ('images=', None, 'set the image directory'),
         ('encryption=', None, 'set the encryption template directory'),
         ('bin=', None, 'set the bin directory'),
@@ -96,6 +100,10 @@
         self.lib = '/usr/lib/wicd/'
         self.share = '/usr/share/wicd/'
         self.etc = '/etc/wicd/'
+        self.scripts = self.etc + "scripts/"
+        self.preconnectscripts = self.scripts + "preconnect/"
+        self.postconnectscripts = self.scripts + "postconnect/"
+        self.disconnectscripts = self.scripts + "disconnect/"
         self.icons = '/usr/share/icons/hicolor/'
         self.images = '/usr/share/pixmaps/wicd/'
         self.encryption = self.etc + 'encryption/templates/'
@@ -175,10 +183,12 @@
         # If we don't get anything from *-config, or it didn't run properly, 
         # or the path is not a proper absolute path, raise an error
         try:
-            pmtemp = subprocess.Popen(["pkg-config","--variable=pm_sleephooks","pm-utils"], stdout=subprocess.PIPE)
+            pmtemp = subprocess.Popen(["pkg-config", "--variable=pm_sleephooks", 
+                                       "pm-utils"], stdout=subprocess.PIPE)
             returncode = pmtemp.wait() # let it finish, and get the exit code
             pmutils_candidate = pmtemp.stdout.readline().strip() # read stdout
-            if len(pmutils_candidate) == 0 or returncode != 0 or not os.path.isabs(pmutils_candidate):
+            if len(pmutils_candidate) == 0 or returncode != 0 or \
+               not os.path.isabs(pmutils_candidate):
                 raise ValueError
             else:
                 self.pmutils = pmutils_candidate
@@ -189,7 +199,8 @@
             kdetemp = subprocess.Popen(["kde-config","--prefix"], stdout=subprocess.PIPE)
             returncode = kdetemp.wait() # let it finish, and get the exit code
             kdedir_candidate = kdetemp.stdout.readline().strip() # read stdout
-            if len(kdedir_candidate) == 0 or returncode != 0 or not os.path.isabs(kdedir_candidate):
+            if len(kdedir_candidate) == 0 or returncode != 0 or \
+               not os.path.isabs(kdedir_candidate):
                 raise ValueError
             else:
                 self.kdedir = kdedir_candidate + '/share/autostart'
@@ -218,11 +229,10 @@
 
 
     def finalize_options(self):
-        if self.distro_detect_failed == True:
-            if not self.no_install_init:
-                if self.init == 'FAIL' or self.initfile == 'FAIL':
-                    print 'ERROR: Failed to detect distro. Configure cannot continue.  ' + \
-                          'Please specify --init and --initfile to continue with configuration.'
+        if self.distro_detect_failed and not self.no_install_init and \
+           'FAIL' in [self.init, self.initfile]:
+            print 'ERROR: Failed to detect distro. Configure cannot continue.  ' + \
+                  'Please specify --init and --initfile to continue with configuration.'
                     
                 
         # loop through the argument definitions in user_options
@@ -408,6 +418,10 @@
     (wpath.lib, ['wicd/wicd-client.py', 'wicd/monitor.py', 'wicd/wicd-daemon.py', 'wicd/configscript.py', 'wicd/suspend.py', 'wicd/autoconnect.py']), #'wicd/wicd-gui.py', 
     (wpath.backends, ['wicd/backends/be-external.py', 'wicd/backends/be-ioctl.py']),
     (wpath.autostart, ['other/wicd-tray.desktop', ]),
+    (wpath.scripts, []),
+    (wpath.disconnectscripts, []),
+    (wpath.preconnectscripts, []),
+    (wpath.postconnectscripts, []),
     ]
     if not wpath.no_install_ncurses:
         data.append(( wpath.lib, ['curses/curses_misc.py']))
@@ -456,14 +470,16 @@
 python setup.py configure has not yet been run.'''
 
 
-wpactrl_ext = Extension(name = 'wpactrl', sources = ['depends/python-wpactrl/wpa_ctrl.c', 'depends/python-wpactrl/wpactrl.c'],
-                extra_compile_args = ["-fno-strict-aliasing"])
+wpactrl_ext = Extension(name = 'wpactrl', 
+                        sources = ['depends/python-wpactrl/wpa_ctrl.c',
+                                   'depends/python-wpactrl/wpactrl.c'],
+                        extra_compile_args = ["-fno-strict-aliasing"])
 
-iwscan_ext = Extension(name      = 'iwscan',
-                libraries = ['iw'],
-                sources   = ['depends/python-iwscan/pyiwscan.c'])
+iwscan_ext = Extension(name = 'iwscan', libraries = ['iw'],
+                       sources = ['depends/python-iwscan/pyiwscan.c'])
     
-setup(cmdclass={'configure' : configure, 'get_translations' : get_translations, 'uninstall' : uninstall, 'test' : test, 'cleargenerated' : cleargenerated},
+setup(cmdclass={'configure' : configure, 'get_translations' : get_translations,
+                'uninstall' : uninstall, 'test' : test, 'cleargenerated' : cleargenerated},
       name="Wicd",
       version=VERSION_NUM,
       description="A wireless and wired network manager",
@@ -476,16 +492,12 @@
 connect at startup to any preferred network within range.
 """,
       author="Adam Blackburn, Dan O'Reilly",
-      author_email="[e-mail], [e-mail]",
+      author_email="[e-mail], [e-mail]",
       url="http://wicd.net",
       license="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html",
-      ## scripts=['configscript.py', 'autoconnect.py', 'gui.py', 'wicd.py', 'daemon.py', 'suspend.py', 'monitor.py'],
-      py_modules=['wicd.networking', 'wicd.misc', 'wicd.gui', 'wicd.wnettools', 'wicd.wpath', 
-                  'wicd.prefs', 'wicd.netentry', 'wicd.dbusmanager', 'wicd.logfile', 'wicd.backend', 
-                  'wicd.configmanager', 'wicd.guiutil'], 
+      py_modules=['wicd.networking', 'wicd.misc', 'wicd.gui', 'wicd.wnettools',
+                  'wicd.wpath', 'wicd.prefs', 'wicd.netentry', 'wicd.dbusmanager', 
+                  'wicd.logfile', 'wicd.backend', 'wicd.configmanager', 'wicd.guiutil'], 
       ext_modules=[iwscan_ext, wpactrl_ext],
       data_files=data
       )
-##print "Running post-install configuration..."
-##os.system("other/postinst")
-##print 'Done.'
 
=== modified file 'wicd/misc.py'
--- wicd/misc.py	2009-02-27 05:08:31 +0000
+++ wicd/misc.py	2009-02-28 20:16:45 +0000
@@ -58,7 +58,7 @@
 GKSUDO = 1
 KDESU = 2
 KTSUSS = 3
-__sudo_dict = { 
+_sudo_dict = { 
     AUTO : "",
     GKSUDO : "gksudo",
     KDESU : "kdesu",
@@ -172,9 +172,20 @@
     """ 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 """
@@ -427,7 +438,7 @@
 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 = []
 
=== modified file 'wicd/networking.py'
--- wicd/networking.py	2009-02-27 05:35:53 +0000
+++ wicd/networking.py	2009-02-28 20:16:45 +0000
@@ -202,10 +202,12 @@
     def Disconnect(self, *args, **kargs):
         """ Disconnect from the network. """
         iface = self.iface
-        if self.disconnect_script != None:
+        misc.ExecuteScripts(wpath.disconnectscripts, self.debug)
+        if self.disconnect_script:
             print 'Running disconnect script'
             misc.ExecuteScript(expand_script_macros(self.disconnect_script,
-                                                    'disconnection', *args))
+                                                    'disconnection', *args),
+                               self.debug)
         iface.ReleaseDHCP()
         iface.SetAddress('0.0.0.0')
         iface.FlushRoutes()
@@ -369,6 +371,10 @@
         iface.Down()
         
     @abortable
+    def run_global_scripts_if_needed(self, script_dir):
+        misc.ExecuteScripts(script_dir, verbose=self.debug)
+
+    @abortable
     def run_script_if_needed(self, script, msg, bssid='wired', essid='wired'):
         """ Execute a given script if needed.
         
@@ -379,7 +385,8 @@
         """
         if script:
             print 'Executing %s script' % (msg)
-            misc.ExecuteScript(expand_script_macros(script, msg, bssid, essid))
+            misc.ExecuteScript(expand_script_macros(script, msg, bssid, essid),
+                               self.debug)
         
     @abortable
     def flush_routes(self, iface):
@@ -761,6 +768,7 @@
         self.is_connecting = True
         
         # Run pre-connection script.
+        self.run_global_scripts_if_needed(wpath.preconnectscripts)
         self.run_script_if_needed(self.before_script, 'pre-connection', 
                                   self.network['bssid'], self.network['essid'])
 
@@ -803,6 +811,7 @@
         self.set_dns_addresses()
         
         # Run post-connection script.
+        self.run_global_scripts_if_needed(wpath.postconnectscripts)
         self.run_script_if_needed(self.after_script, 'post-connection', 
                                   self.network['bssid'], self.network['essid'])
 
@@ -971,6 +980,7 @@
         self.is_connecting = True
 
         # Run pre-connection script.
+        self.run_global_scripts_if_needed(wpath.preconnectscripts)
         self.run_script_if_needed(self.before_script, 'pre-connection', 'wired', 
                                   'wired')
 
@@ -989,6 +999,7 @@
         self.set_dns_addresses()
         
         # Run post-connection script.
+        self.run_global_scripts_if_needed(wpath.postconnectscripts)
         self.run_script_if_needed(self.after_script, 'post-connection', 'wired', 
                                   'wired')