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 improvement on robustness
[distro-functions]
/
src
/
package-manager-abstractions
diff --git
a/src/package-manager-abstractions
b/src/package-manager-abstractions
index 0667bd99e174d55950e8785a2aaec97c38f12e7b..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
$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 "$@"
}
@@
-134,7
+134,7
@@
elif command -v apt-get &>/dev/null; then
echo pi-nostart "$@"
fi
if [[ $EUID == 0 ]]; 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
#!/bin/sh
exit 101
EOF
@@
-142,7
+142,7
@@
EOF
DEBIAN_FRONTEND=noninteractive apt-get -y install --purge --auto-remove "$@" || ret=$?
rm $f
else
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
#!/bin/sh
exit 101
EOF
@@
-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
@@
-222,11
+224,11
@@
EOF
if ! $all; then
arg=(--filter-origins "$(positive-origins)")
fi
if ! $all; then
arg=(--filter-origins "$(positive-origins)")
fi
- if [[ $file == */* ]]; then
- apt-file "${arg[@]}" find -x "$file"\$
- else
+ if [[ $file == /* ]]; then
apt-file "${arg[@]}" find -x /"$file"\$
update-alternatives --list "$file" 2>/dev/null
apt-file "${arg[@]}" find -x /"$file"\$
update-alternatives --list "$file" 2>/dev/null
+ else
+ apt-file "${arg[@]}" find -x "$file"\$
fi
fi
}
fi
fi
}
@@
-245,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() {