X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=btrfsmaint;h=f50f5494e2aba068fb68aa2bd51f748b87d358a7;hb=dab96f8fa4c701db13ba734fa0c07b5d12fc8fae;hp=0a36d05bb2ba477854cd80b9fbe633d0c9776d6a;hpb=7f6a974222bd0f3936b61a8430d3e28a13307632;p=distro-setup

diff --git a/btrfsmaint b/btrfsmaint
index 0a36d05..f50f549 100755
--- a/btrfsmaint
+++ b/btrfsmaint
@@ -1,9 +1,30 @@
 #!/bin/bash
+# I, Ian Kelling, follow the GNU license recommendations at
+# https://www.gnu.org/licenses/license-recommendations.en.html. They
+# recommend that small programs, < 300 lines, be licensed under the
+# Apache License 2.0. This file contains or is part of one or more small
+# programs. If a small program grows beyond 300 lines, I plan to switch
+# its license to GPL.
+
+# Copyright 2024 Ian Kelling
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#     http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 
 
 [[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@"
 
-set -e; . /usr/local/lib/err; set +e
+set -e; . /usr/local/lib/bash-bear; set +e
 
 # inspired from
 # https://github.com/kdave/btrfsmaintenance
@@ -36,12 +57,10 @@ check-idle() {
   export XAUTHORITY=/home/iank/.Xauthority
   export DISPLAY=:0
   locked=false
-  if lock_info=$(xscreensaver-command -time); then
+  if lock_info=$(xscreensaver-command -time 2>/dev/null); then
     if [[ $lock_info != *non-blanked* ]]; then
       locked=true
     fi
-  else
-    locked=true
   fi
 }