mirror of
https://git.adityakumar.xyz/betterlockscreen-openrc.git
synced 2024-09-07 22:00:39 +00:00
resolved merge conflict
This commit is contained in:
commit
8652b68c40
|
@ -2,7 +2,7 @@
|
|||
|
||||
Thanks to all the amazing people for all your wonderful PRs, issues and ideas, all contributions are welcome!
|
||||
|
||||
We are using [next](https://github.com/pavanjadhaw/betterlockscreen/tree/next) as our development-branch and master for the latest stable release. Please provide your pull-requests based on our next-branch.
|
||||
We are using [next](https://github.com/betterlockscreen/betterlockscreen/tree/next) as our development-branch and master for the latest stable release. Please provide your pull-requests based on our next-branch.
|
||||
|
||||
For Nix-Users: We provide a nix-shell for development :-)
|
||||
|
||||
|
|
2
LICENSE
2
LICENSE
|
@ -1,6 +1,6 @@
|
|||
MIT License
|
||||
|
||||
Copyright (c) 2017-2021 Pavan Jadhaw, and others (https://github.com/pavanjadhaw/betterlockscreen/graphs/contributors)
|
||||
Copyright (c) 2017-2022 Pavan Jadhaw, and others (https://github.com/betterlockscreen/betterlockscreen/graphs/contributors)
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
# Author : Copyright (c) 2017-2021 Pavan Jadhaw, and others (https://github.com/pavanjadhaw/betterlockscreen/graphs/contributors)
|
||||
# Github Profile : https://github.com/pavanjadhaw
|
||||
# Project Repository : https://github.com/pavanjadhaw/betterlockscreen
|
||||
# Author : Copyright (c) 2017-2022 Pavan Jadhaw, and others (https://github.com/betterlockscreen/betterlockscreen/graphs/contributors)
|
||||
# Project Repository : https://github.com/betterlockscreen/betterlockscreen
|
||||
|
||||
cmd_exists () {
|
||||
command -v "$1" >/dev/null
|
||||
|
@ -278,7 +277,7 @@ postlock() {
|
|||
lockselect() {
|
||||
|
||||
echof act "Running prelock..."
|
||||
prelock &
|
||||
prelock
|
||||
|
||||
case "$1" in
|
||||
dim) if [ -f "$CUR_L_DIM" ]; then lock "$CUR_L_DIM"; else failsafe; fi ;;
|
||||
|
@ -291,7 +290,7 @@ lockselect() {
|
|||
esac
|
||||
|
||||
echof act "Running postlock..."
|
||||
postlock &
|
||||
postlock
|
||||
}
|
||||
|
||||
# calculate adjustments for hidpi displays
|
||||
|
@ -607,8 +606,8 @@ update () {
|
|||
local geometry="${dinfo[2]}"
|
||||
|
||||
read -r -a cols <<< "${geometry//[x+-]/ }"
|
||||
local position="${geometry#*${cols[1]}}"
|
||||
local resolution="${geometry%${position}*}"
|
||||
local position="${geometry#*"${cols[1]}"}"
|
||||
local resolution="${geometry%"${position}"*}"
|
||||
|
||||
if [[ $id -eq "$display_on" ]] || [[ "$display_on" -eq 0 ]]; then
|
||||
|
||||
|
@ -788,7 +787,7 @@ usage() {
|
|||
echo " Scale image to span multiple displays"
|
||||
echo
|
||||
echo " --off <N>"
|
||||
echo " Turn display off after N minutes"
|
||||
echo " Turn display off after N seconds"
|
||||
echo
|
||||
echo " --fx <EFFECT,EFFECT,EFFECT>"
|
||||
echo " List of effects to generate"
|
||||
|
|
Loading…
Reference in a new issue