iankelling.org
/
git
/
distro-functions
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update for t11, and fixes for find file
[distro-functions]
/
src
/
package-manager-abstractions
diff --git
a/src/package-manager-abstractions
b/src/package-manager-abstractions
index 0bd53894536a2ab869900c93742fe1a4c337af22..0f4815a480587f58d3c3d18b731370c679d48b1d 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
$s yum -y install "$@"
}
# package find
- pf() {
+ pf
d
() {
local s; [[ $EUID != 0 ]] && s=sudo
$s yum search "$@"
}
local s; [[ $EUID != 0 ]] && s=sudo
$s yum search "$@"
}
@@
-152,10
+152,12
@@
EOF
fi
return $ret
}
fi
return $ret
}
- pf() {
+ # package find description
+ pfd() {
# package name and descriptions
apt-cache search "$@"
}
# 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
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
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() {
@@
-201,10
+200,14
@@
EOF
}
pfile() {
# -a = search all repos
}
pfile() {
# -a = search all repos
- local 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
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"
if [[ $file == /* ]]; then
dpkg -S "$file"
- elif [[ $file == */* ]]; then
- apt-file $arg find -x "$file"\$
else
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() {
fi
}
pkgfiles() {
@@
-239,7
+247,7
@@
elif command -v pacman &>/dev/null; then
pi() {
pacaur -S --noconfirm --needed --noedit "$@"
}
pi() {
pacaur -S --noconfirm --needed --noedit "$@"
}
- pf() {
+ pf
d
() {
pacaur -Ss "$@"
}
pu() {
pacaur -Ss "$@"
}
pu() {