From f816c0cdf8d9c60103d11dc0e0df18f6389f107a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matt=C3=A9o=20Rossillol=E2=80=91=E2=80=91Laruelle?= Date: Sat, 28 Dec 2019 00:37:05 +0100 Subject: [PATCH] fix some mistakes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattéo Rossillol‑‑Laruelle --- Makefile | 2 +- backlight-restorer | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index a53c469..3d09eb3 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ PREFIX ?= /usr/local DESTDIR ?= -INITDDIR ?= $(DESDIR)$(PREFIX)/etc/init.d +INITDDIR ?= $(DESTDIR)$(PREFIX)/etc/init.d INSTALL ?= install -D -m755 RM ?= rm -f diff --git a/backlight-restorer b/backlight-restorer index f895a56..3e8bf1c 100755 --- a/backlight-restorer +++ b/backlight-restorer @@ -18,17 +18,24 @@ description="An OpenRC service for restoring the last brightness level on reboot" +cache_dir="/var/cache/backlight-restorer" + start() { ebegin "Restoring the screen brightness" + checkpath -D -o "root:root" "${cache_dir}" + for card in $(basename /sys/class/backlight/*); do - local -r blight=$(cat "/var/cache/backlight/${card}") - if [ ${blight} -ne 0 ]; then + if [ -e "${cache_dir}/${card}" ]; then + local -r blight=$(cat "${cache_dir}/${card}") + fi + + if [ ${blight:=0} -ne 0 ]; then echo ${blight} > "/sys/class/backlight/${card}/brightness" fi sts=$? - test ${sts} -ne 0 || break + test ${sts} -eq 0 || break done eend ${sts} "Cannot restore the brightness of ${card}" @@ -37,14 +44,14 @@ start() { stop() { ebegin "Saving the screen brightness" - checkpath -D -o "root:root" /var/cache/backlight + checkpath -D -o "root:root" "${cache_dir}" for card in $(basename /sys/class/backlight/*); do cp "/sys/class/backlight/${card}/brightness" \ - "/var/cache/backlight/${card}" + "${cache_dir}/${card}" sts=$? - test ${sts} -ne 0 || break + test ${sts} -eq 0 || break done eend ${sts} "Cannot save the brightness of ${card}"