distro specific fixes

[distro-setup] / btrfsmaint

diff --git a/btrfsmaint b/btrfsmaint
index c35004ef2fc7e5bb18c5142ab266390327f94053..3eb4759ad104029c54613c754a2980116ae95812 100755 (executable)
--- a/btrfsmaint
+++ b/btrfsmaint
@@ -1,4 +1,25 @@
 #!/bin/bash
 #!/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]}" "$@"
 
 
 [[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@"


@@ -8,7 +29,7 @@ set -e; . /usr/local/lib/bash-bear; set +e
 # inspired from
 # https://github.com/kdave/btrfsmaintenance
 
 # inspired from
 # https://github.com/kdave/btrfsmaintenance
 

-if [[ $INVOCATION_ID ]]; then
+if [[ $PPID == 1 ]]; then

   err-cleanup() {
     exim -odf -i root <<EOF
 From: root@$(hostname -f)
   err-cleanup() {
     exim -odf -i root <<EOF
 From: root@$(hostname -f)


@@ -36,12 +57,10 @@ check-idle() {
   export XAUTHORITY=/home/iank/.Xauthority
   export DISPLAY=:0
   locked=false
   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
     if [[ $lock_info != *non-blanked* ]]; then
       locked=true
     fi

-  else
-    locked=true

   fi
 }
 
   fi
 }