X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=src%2Fpackage-manager-abstractions;h=0f4815a480587f58d3c3d18b731370c679d48b1d;hb=33796378c9b8fe2d6e30226fe0a977254b3246e8;hp=2c291e83c8f244588cdd15d715fe8f7812c761ab;hpb=853cf1c194ece72289d3e317d5436e73b39d50df;p=distro-functions

diff --git a/src/package-manager-abstractions b/src/package-manager-abstractions
index 2c291e8..0f4815a 100644
--- 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 "$@"
   }
@@ -48,6 +48,31 @@ if command -v yum &> /dev/null; then
   }
 
 elif command -v apt-get &>/dev/null; then
+  plock-wait() {
+    local i
+    i=0
+    while fuser /var/lib/dpkg/lock &>/dev/null; do
+      sleep 1
+      i=$(( i+1 ))
+      if (( i > 300 )); then
+        echo "error: timed out waiting for /var/lib/dpkg/lock" >&2
+        return 1
+      fi
+    done
+  }
+  pcheck() {
+    for arg; do
+      if [[ $1 == -* ]]; then
+        shift
+      else
+        break
+      fi
+    done
+    if dpkg -s -- "$@" |& grep -Fx "Status: install ok installed" &>/dev/null; then
+      return 1
+    fi
+    return 0
+  }
   pp() { # package policy
     apt-cache policy $@
   }
@@ -63,44 +88,76 @@ elif command -v apt-get &>/dev/null; then
     esac
   }
   pupdate() {
-    local s f; [[ $EUID != 0 ]] && s=sudo
+    local now t s f cachetime limittime; [[ $EUID != 0 ]] && s=sudo
     # update package list if its more than an 2 hours old
     f=/var/cache/apt/pkgcache.bin
-    if [[ ! -r $f ]] \
-         || (( $(( $(date +%s) - $(stat -c %Y $f ) )) > 60*60*2 )); then
+    if [[ -r $f ]]; then
+      cachetime=$(stat -c %Y $f )
+    else
+      cachetime=0
+    fi
+    now=$(date +%s)
+    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 )
+        if (( t > limittime )); then
+          limittime=$t
+        fi
+      fi
+    done
+    if (( cachtime > limittime )); then
       $s apt-get update
     fi
   }
   pi() {
-    if dpkg -s -- "$@" | grep -Fx "Status: install ok installed" &>/dev/null; then
-      return 0
-    fi
-    while fuser /var/lib/dpkg/lock &>/dev/null; do sleep 1; done
+    pcheck "$@" || return 0
     pupdate
-    local s; [[ $EUID != 0 ]] && s=sudo
-    $s $PI_PREFIX apt-get -y --allow-downgrades install --purge --auto-remove "$@"
+    if [[ $- != *i* ]]; then
+      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
+
   }
 
   pi-nostart() {
-    if dpkg -s -- "$@" &>/dev/null; then
-      return 0
-    fi
-    while fuser /var/lib/dpkg/lock &>/dev/null; do sleep 1; done
+    local ret=
+    pcheck "$@" || return 0
+    plock-wait
     pupdate
-    local s; [[ $EUID != 0 ]] && s=sudo
     local f=/usr/sbin/policy-rc.d
-    $s dd of=$f <<EOF
+    if [[ $- != *i* ]]; then
+      echo pi-nostart "$@"
+    fi
+    if [[ $EUID == 0 ]]; then
+      dd of=$f 2>/dev/null <<EOF
 #!/bin/sh
 exit 101
 EOF
-    $s chmod +x $f
-    $s apt-get -y install --allow-downgrades --purge --auto-remove "$@"
-    $s rm $f
+      chmod +x $f
+      DEBIAN_FRONTEND=noninteractive apt-get -y install --purge --auto-remove "$@" || ret=$?
+      rm $f
+    else
+      sudo dd of=$f 2>/dev/null <<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
+    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
@@ -113,17 +170,25 @@ EOF
   }
   pu() {
     local s; [[ $EUID != 0 ]] && s=sudo
-    while fuser /var/lib/dpkg/lock &>/dev/null; do sleep 1; done
-    $s apt-get -y remove --allow-downgrades --purge --auto-remove  "$@"
+    local needed=false
+    for arg; do
+      if dpkg -s -- "$arg" &>/dev/null; then
+        needed=true
+        break
+      fi
+    done
+    $needed || return 0
+    plock-wait
+    $s apt-get -y remove --purge --auto-remove  "$@"
     # seems slightly redundant, but it removes more stuff sometimes.
-    $s apt-get -y --allow-downgrades autoremove
+    $s apt-get -y autoremove
   }
   pup() { # upgrade
-    while fuser /var/lib/dpkg/lock &>/dev/null; do sleep 1; done
+    plock-wait
     pupdate
     local s; [[ $EUID != 0 ]] && s=sudo
-    $s apt-get -y dist-upgrade --allow-downgrades --purge --auto-remove "$@"
-    $s apt-get -y autoremove --allow-downgrades
+    $s apt-get -y dist-upgrade --purge --auto-remove "$@"
+    $s apt-get -y autoremove
   }
   # package info
   pl() {
@@ -134,6 +199,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
@@ -144,11 +218,18 @@ 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() {
@@ -166,7 +247,7 @@ elif command -v pacman &>/dev/null; then
   pi() {
     pacaur -S --noconfirm --needed --noedit "$@"
   }
-  pf() {
+  pfd() {
     pacaur -Ss "$@"
   }
   pu() {