Merge branch 'master' of ssh://holtrop.homelinux.com/files

2011-11-06 13:47:21 -05:00 · 2011-11-06 13:47:21 -05:00 · ceb3b1effd
commit ceb3b1effd
parent f08ea06381 cfe2d3a130
2 changed files with 3 additions and 2 deletions
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash

 export DISPLAY=:0

--- a/3
+++ b/3
@ -112,7 +112,8 @@ def main(argv):
    f = open(LOG_FILE, 'r')
    for line in iter(f.readline, ''):
        if (re.search(r'gnome-screensaver.*unlocked.login.keyring', line)
-                or re.search(r'screen unlocked', line)):
+                or re.search(r'screen unlocked', line)
+                or re.search(r'gdm.session.*session.opened.for.user', line)):
            # found a login line
            dt = get_dt_from_log_line(line)
            idx = (dt.date() - monday).days