minor improvements

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

diff --git a/src/package-manager-abstractions b/src/package-manager-abstractions
index dece84830169562a1217de1a7b71f019c7b866ba..0bd53894536a2ab869900c93742fe1a4c337af22 100644 (file)
--- a/src/package-manager-abstractions
+++ b/src/package-manager-abstractions
@@ -100,7 +100,7 @@ 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
@@ -113,11 +113,15 @@ elif command -v apt-get &>/dev/null; then
   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,18 +129,27 @@ 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 2>/dev/null <<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 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
-    $s apt-get -y install --purge --auto-remove "$@" || ret=$?
-    $s rm $f
     return $ret
   }
   pf() {
@@ -187,6 +200,11 @@ EOF
     fi
   }
   pfile() {
+    # -a = search all repos
+    local arg
+    if [[ $1 != -a ]]; then
+      arg="--filter-origins $(positive-origins)"
+    fi
     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,10 +215,12 @@ 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"
+    elif [[ $file == */* ]]; then
+      apt-file $arg find -x "$file"\$
     else
-      apt-file find -x /"$file"\$
+      apt-file $arg find -x /"$file"\$
       update-alternatives --list "$file" 2>/dev/null
     fi
   }