Merge commit '1.4' into debian

* commit '1.4':
  Bump version
  Allow dots in the script names
  Remove old option name

1 files changed, 5 insertions, 4 deletions

diff --git a/spline-startup b/spline-startup
index a91faad..2c7dc54 100755
--- a/spline-startup
+++ b/spline-startup
@@ -10,7 +10,7 @@ from subprocess import Popen, PIPE, STDOUT
 from pipes import quote
 
 
-VERSION = '1.3'
+VERSION = '1.4'
 
 
 def is_root():
@@ -117,7 +117,8 @@ class SplineStartup(object):
         args = []
         if reverse:
             args.append('--reverse')
-        cmd = ['run-parts', '--list'] + args + ['--', directory]
+        cmd = ['run-parts', '--list', '--regex', '^[a-zA-Z0-9_.-]+$'] + \
+              args + ['--', directory]
 
         self._pinfo('Getting scripts: %s' % ' '.join(cmd))
         proc = Popen(cmd, stdout=PIPE, stderr=STDOUT)
@@ -163,13 +164,13 @@ class SplineStartup(object):
             for username in self.options.user:
                 try:
                     user = pwd.getpwnam(username)
-                    self._run_scripts(user, self.options.action)
+                    self._run_scripts(user, self.options.actions)
                 except KeyError:
                     self._perror("Invalid user '%s'" % user)
         else:
             userlist = _get_users(self.options.config)
             for user in userlist:
-                self._run_scripts(user, self.options.action)
+                self._run_scripts(user, self.options.actions)
 
 
 def main():