iankelling.org
/
git
/
distro-functions
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor fixes and improvements
[distro-functions]
/
src
/
package-manager-abstractions
diff --git
a/src/package-manager-abstractions
b/src/package-manager-abstractions
index a050be9dc4061ff2bbae3e3c4fac2aceb394fb14..0667bd99e174d55950e8785a2aaec97c38f12e7b 100644
(file)
--- a/
src/package-manager-abstractions
+++ b/
src/package-manager-abstractions
@@
-48,8
+48,27
@@
if command -v yum &> /dev/null; then
}
elif command -v apt-get &>/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() {
pcheck() {
- if dpkg -s -- "$@" | grep -Fx "Status: install ok installed" &>/dev/null; then
+ 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
return 1
fi
return 0
@@
-69,35
+88,69
@@
elif command -v apt-get &>/dev/null; then
esac
}
pupdate() {
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
# 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() {
pcheck "$@" || return 0
$s apt-get update
fi
}
pi() {
pcheck "$@" || return 0
- while fuser /var/lib/dpkg/lock &>/dev/null; do sleep 1; done
pupdate
pupdate
- local s; [[ $EUID != 0 ]] && s=sudo
- $s $PI_PREFIX apt-get -y 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() {
}
pi-nostart() {
+ local ret=
pcheck "$@" || return 0
pcheck "$@" || return 0
- while fuser /var/lib/dpkg/lock &>/dev/null; do sleep 1; done
+ plock-wait
pupdate
pupdate
- local s; [[ $EUID != 0 ]] && s=sudo
local f=/usr/sbin/policy-rc.d
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
#!/bin/sh
exit 101
EOF
- $s chmod +x $f
- $s apt-get -y install --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 name and descriptions
}
pf() {
# package name and descriptions
@@
-115,20
+168,25
@@
EOF
}
pu() {
local s; [[ $EUID != 0 ]] && s=sudo
}
pu() {
local s; [[ $EUID != 0 ]] && s=sudo
- while fuser /var/lib/dpkg/lock &>/dev/null; do sleep 1; done
+ 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 autoremove
}
pup() { # upgrade
$s apt-get -y remove --purge --auto-remove "$@"
# seems slightly redundant, but it removes more stuff sometimes.
$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 --purge --auto-remove "$@"
$s apt-get -y autoremove
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() {
}
# package info
pl() {
@@
-139,6
+197,15
@@
EOF
fi
}
pfile() {
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
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
@@
-149,11
+216,18
@@
EOF
# if [[ $file == /* ]] && ! ucfq -w $file | grep ::: &>/dev/null; then
# ucfq $file
# 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
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"\$
+ else
+ apt-file "${arg[@]}" find -x /"$file"\$
+ update-alternatives --list "$file" 2>/dev/null
+ fi
fi
}
pkgfiles() {
fi
}
pkgfiles() {