shellcheck fixes, including real bug

[distro-functions] / src / package-manager-abstractions

diff --git a/src/package-manager-abstractions b/src/package-manager-abstractions
index dece84830169562a1217de1a7b71f019c7b866ba..aa14875a093bfee508bd2dca1fa85012cfdc9c85 100644 (file)
--- a/src/package-manager-abstractions
+++ b/src/package-manager-abstractions
@@ -1,5 +1,12 @@
 #!/bin/bash
-# Copyright (C) 2014 Ian Kelling
+# 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.
@@ -26,7 +33,7 @@ if command -v yum &> /dev/null; then
     $s yum -y install "$@"
   }
   # package find
-  pf() {
+  pfd() {
     local s; [[ $EUID != 0 ]] && s=sudo
     $s yum search "$@"
   }
@@ -35,6 +42,7 @@ if command -v yum &> /dev/null; then
     local s; [[ $EUID != 0 ]] && s=sudo
     $s yum autoremove "$@"
   }
+  # shellcheck disable=SC2120
   pup() { # upgrade
     local s; [[ $EUID != 0 ]] && s=sudo
     $s yum -y distro-sync full "$@"
@@ -100,24 +108,28 @@ elif command -v apt-get &>/dev/null; then
     limittime=$(( now - 60*60*2 ))
     for f in /etc/apt/sources.list /etc/apt/sources.list.d/*.list; do
       if [[ -r $f ]]; then
-        t=$(stat -c %Y $f )
+        t=$(stat  -c %Y $f )
         if (( t > limittime )); then
           limittime=$t
         fi
       fi
     done
-    if (( cachtime > limittime )); then
+    if (( cachetime > limittime )); then
       $s apt-get update
     fi
   }
   pi() {
     pcheck "$@" || return 0
     pupdate
-    local s; [[ $EUID != 0 ]] && s=sudo
     if [[ $- != *i* ]]; then
-      echo pi "$@"
+      echo pi "$*"
+    fi
+    if [[ $EUID == 0 ]]; then
+      DEBIAN_FRONTEND=noninteractive apt-get -y install --purge --auto-remove "$@"
+    else
+      sudo DEBIAN_FRONTEND=noninteractive apt-get -y install --purge --auto-remove "$@"
     fi
-    $s $PI_PREFIX apt-get -y install --purge --auto-remove "$@"
+
   }
 
   pi-nostart() {
@@ -125,24 +137,35 @@ elif command -v apt-get &>/dev/null; then
     pcheck "$@" || return 0
     plock-wait
     pupdate
-    local s; [[ $EUID != 0 ]] && s=sudo
     local f=/usr/sbin/policy-rc.d
-    $s dd of=$f 2>/dev/null <<EOF
+    if [[ $- != *i* ]]; then
+      echo pi-nostart "$@"
+    fi
+    if [[ $EUID == 0 ]]; then
+      dd of=$f status=none <<EOF
 #!/bin/sh
 exit 101
 EOF
-    $s chmod +x $f
-    if [[ $- != *i* ]]; then
-      echo pi-nostart "$@"
+      chmod +x $f
+      DEBIAN_FRONTEND=noninteractive apt-get -y install --purge --auto-remove "$@" || ret=$?
+      rm $f
+    else
+      sudo dd of=$f status=none <<EOF
+#!/bin/sh
+exit 101
+EOF
+      sudo chmod +x $f
+      sudo DEBIAN_FRONTEND=noninteractive apt-get -y install --purge --auto-remove "$@" || ret=$?
+      sudo rm $f
     fi
-    $s apt-get -y install --purge --auto-remove "$@" || ret=$?
-    $s rm $f
     return $ret
   }
-  pf() {
+  # package find description
+  pfd() {
     # package name and descriptions
     apt-cache search "$@"
   }
+  # package find file
   pff() {
     local s; [[ $EUID != 0 ]] && s=sudo
     # nice aptitude search from emacs shell. package description width as
@@ -168,15 +191,13 @@ EOF
     # seems slightly redundant, but it removes more stuff sometimes.
     $s apt-get -y autoremove
   }
+  # shellcheck disable=SC2120
   pup() { # upgrade
     plock-wait
     pupdate
     local s; [[ $EUID != 0 ]] && s=sudo
     $s apt-get -y dist-upgrade --purge --auto-remove "$@"
     $s apt-get -y autoremove
-    if [[ -e /usr/sbin/checkrestart ]]; then
-      $s /usr/sbin/checkrestart -p
-    fi
   }
   # package info
   pl() {
@@ -187,6 +208,15 @@ EOF
     fi
   }
   pfile() {
+    # -a = search all repos
+    local -a arg all
+    all=false
+    case $1 in
+      -a)
+        all=true
+        shift
+        ;;
+    esac
     local file=$1
     # ucfq can tell us about config files which are not tracked
     # with apt-file. but, for at least a few files I tested
@@ -197,16 +227,23 @@ EOF
     # if [[ $file == /* ]] && ! ucfq -w $file | grep ::: &>/dev/null; then
     #    ucfq $file
 
-    if [[ $file == */* ]]; then
-      apt-file find -x "$file"\$
+    if [[ $file == /* ]]; then
+      dpkg -S "$file"
     else
-      apt-file find -x /"$file"\$
-      update-alternatives --list "$file" 2>/dev/null
+      if ! $all; then
+        arg=(--filter-origins "$(positive-origins)")
+      fi
+      if [[ $file == /* ]]; then
+        apt-file "${arg[@]}" find -x /"$file"\$
+        update-alternatives --list "$file" 2>/dev/null
+      else
+        apt-file "${arg[@]}" find -x "$file"\$
+      fi
     fi
   }
   pkgfiles() {
     if dpkg -s "$1" &>/dev/null; then
-      dpkg-query -L $1
+      dpkg-query -L $1 | while read -r l; do [[ -f $l ]] && printf "%s\n" "$l"; done
     else
       apt-file -x list "^$1$"
     fi
@@ -219,7 +256,7 @@ elif command -v pacman &>/dev/null; then
   pi() {
     pacaur -S --noconfirm --needed --noedit "$@"
   }
-  pf() {
+  pfd() {
     pacaur -Ss "$@"
   }
   pu() {
@@ -231,14 +268,15 @@ elif command -v pacman &>/dev/null; then
   aurex() {
     p="$1"
     aur='https://aur.archlinux.org'
-    curl -s $aur/$(curl -s "$aur/rpc.php?type=info&arg=$p" \
-                     | jq -r .results.URLPath) | tar xz
+    curl -s $aur/"$(curl -s "$aur/rpc.php?type=info&arg=$p" \
+                     | jq -r .results.URLPath)" | tar xz
     cd "$p"
 
   }
   pmirror() {
     local s; [[ $EUID != 0 ]] && s=sudo
-    local x=$(mktemp)
+    local x
+    x=$(mktemp)
     curl -s "https://www.archlinux.org/mirrorlist/\
 ?country=US&protocol=https&ip_version=4&ip_version=6&use_mirror_status=on" \
       | sed -r 's/^[ #]*(Server *=)/\1/' > $x
@@ -247,6 +285,7 @@ elif command -v pacman &>/dev/null; then
       rm $x
     fi
   }
+  # shellcheck disable=SC2120
   pup() { # upgrade
     local s; [[ $EUID != 0 ]] && s=sudo
     # file_time + 24 hours > current_time