From b4c70afa3bd3055744d005129eb42c4f76c270c8 Mon Sep 17 00:00:00 2001 From: Pig Monkey Date: Sun, 20 Mar 2016 13:16:54 -0700 Subject: [PATCH] always adjust screen brightness on lock --- roles/screensaver/files/lock.sh | 17 +++++++++++++++++ .../lock.sh.j2 => files/sleeplock.sh} | 4 +--- roles/screensaver/tasks/main.yml | 5 ++++- 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100755 roles/screensaver/files/lock.sh rename roles/screensaver/{templates/lock.sh.j2 => files/sleeplock.sh} (50%) diff --git a/roles/screensaver/files/lock.sh b/roles/screensaver/files/lock.sh new file mode 100755 index 0000000..8c65ae1 --- /dev/null +++ b/roles/screensaver/files/lock.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +hash light 2> /dev/null +if [ $? -eq 0 ]; then + BRIGHTNESS=true +fi + +if ! pidof physlock > /dev/null; then + if [ "$BRIGHTNESS" = true ]; then + light -O + light -S 10 + fi + /usr/sbin/physlock -m + if [ "$BRIGHTNESS" = true ]; then + light -I + fi +fi diff --git a/roles/screensaver/templates/lock.sh.j2 b/roles/screensaver/files/sleeplock.sh similarity index 50% rename from roles/screensaver/templates/lock.sh.j2 rename to roles/screensaver/files/sleeplock.sh index c850d47..ef51243 100755 --- a/roles/screensaver/templates/lock.sh.j2 +++ b/roles/screensaver/files/sleeplock.sh @@ -2,7 +2,5 @@ # {{ ansible_managed }} if [ "$1" = "post" ]; then - if ! pidof physlock > /dev/null; then - /usr/sbin/physlock -m - fi + /usr/local/bin/lock fi diff --git a/roles/screensaver/tasks/main.yml b/roles/screensaver/tasks/main.yml index c616740..b4aec7c 100644 --- a/roles/screensaver/tasks/main.yml +++ b/roles/screensaver/tasks/main.yml @@ -7,5 +7,8 @@ tags: - aur +- name: Push lock script + copy: src=lock.sh dest=/usr/local/bin/lock mode=0755 + - name: Push sleep lock script - template: src=lock.sh.j2 dest=/usr/lib/systemd/system-sleep/lock.sh mode=755 + copy: src=sleeplock.sh dest=/usr/lib/systemd/system-sleep/lock.sh mode=0755