minor improvement on robustness

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

diff --git a/src/package-manager-abstractions b/src/package-manager-abstractions
index e56ec48f1cd12e8c04000c99d898e76fc5b1b4db..96e4f6db55335e3263e59aa9d702d87bb28bfa8d 100644 (file)
--- a/src/package-manager-abstractions
+++ b/src/package-manager-abstractions
@@ -26,7 +26,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 "$@"
   }
@@ -134,7 +134,7 @@ elif command -v apt-get &>/dev/null; then
       echo pi-nostart "$@"
     fi
     if [[ $EUID == 0 ]]; then
-      dd of=$f 2>/dev/null <<EOF
+      dd of=$f status=none <<EOF
 #!/bin/sh
 exit 101
 EOF
@@ -142,7 +142,7 @@ EOF
       DEBIAN_FRONTEND=noninteractive apt-get -y install --purge --auto-remove "$@" || ret=$?
       rm $f
     else
-      sudo dd of=$f 2>/dev/null <<EOF
+      sudo dd of=$f status=none <<EOF
 #!/bin/sh
 exit 101
 EOF
@@ -152,10 +152,12 @@ EOF
     fi
     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
@@ -187,9 +189,6 @@ EOF
     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() {
@@ -201,10 +200,14 @@ EOF
   }
   pfile() {
     # -a = search all repos
-    local -a arg
-    if [[ $1 != -a ]]; then
-      arg=(--filter-origins "$(positive-origins)")
-    fi
+    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
@@ -217,11 +220,16 @@ EOF
 
     if [[ $file == /* ]]; then
       dpkg -S "$file"
-    elif [[ $file == */* ]]; then
-      apt-file "${arg[@]}" find -x "$file"\$
     else
-      apt-file "${arg[@]}" 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() {
@@ -239,7 +247,7 @@ elif command -v pacman &>/dev/null; then
   pi() {
     pacaur -S --noconfirm --needed --noedit "$@"
   }
-  pf() {
+  pfd() {
     pacaur -Ss "$@"
   }
   pu() {