github/byobu
1
0
Fork 0
mirror of https://github.com/dustinkirkland/byobu synced 2025-08-22 06:23:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

* usr/lib/byobu/updates_available:

Browse source 
- localize variables
  - save a fork
  - fix detection of updates, which only worked when there were security
    updates
This commit is contained in:
Dustin Kirkland 2011-08-29 08:56:04 -05:00
commit ae4db2486e
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
debian/changelog vendored
View file

@ -1,6 +1,10 @@
byobu (4.33) unreleased; urgency=low byobu (4.33) unreleased; urgency=low
* UNRELEASED * usr/lib/byobu/updates_available:
- localize variables
- save a fork
- fix detection of updates, which only worked when there were security
updates
-- Dustin Kirkland <kirkland@ubuntu.com> Fri, 26 Aug 2011 19:07:32 -0500 -- Dustin Kirkland <kirkland@ubuntu.com> Fri, 26 Aug 2011 19:07:32 -0500

15
usr/lib/byobu/updates_available
View file

@ -20,8 +20,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
___print_updates() { ___print_updates() {
u=$1 local u= s=
s=$2 read u s < "$1"
if [ -n "$u" ]; then if [ -n "$u" ]; then
if [ "$u" -gt 0 ]; then if [ "$u" -gt 0 ]; then
color b r W; printf "%d" "$u"; color -; color r W; printf "!" color b r W; printf "%d" "$u"; color -; color r W; printf "!"
@ -36,7 +36,7 @@ ___print_updates() {
} }
___update_cache() { ___update_cache() {
mycache=$1 local mycache=$1
# Now we actually have to do hard computational work to calculate updates. # Now we actually have to do hard computational work to calculate updates.
# Let's try to be "nice" about it: # Let's try to be "nice" about it:
renice 10 $$ >/dev/null 2>&1 || true renice 10 $$ >/dev/null 2>&1 || true
@ -69,7 +69,7 @@ ___update_cache() {
___update_needed() { ___update_needed() {
# Checks if we need to update the cache. # Checks if we need to update the cache.
# TODO: add more distro # TODO: add more distro
mycache=$1 local mycache=$1
# The cache doesn't exist: create it # The cache doesn't exist: create it
[ ! -e "$mycache" ] && return 0 [ ! -e "$mycache" ] && return 0
if command -v apt-get >/dev/null; then if command -v apt-get >/dev/null; then
@ -81,6 +81,7 @@ ___update_needed() {
return $? return $?
elif command -v pacman >/dev/null; then elif command -v pacman >/dev/null; then
# Archlinux # Archlinux
local db
for db in /var/lib/pacman/sync/*.db; do for db in /var/lib/pacman/sync/*.db; do
[ "$db" -nt "$mycache" ] && return 0 [ "$db" -nt "$mycache" ] && return 0
done done
@ -91,11 +92,11 @@ ___update_needed() {
__updates_available_detail() { __updates_available_detail() {
if command -v apt-get >/dev/null; then if command -v apt-get >/dev/null; then
detail=`apt-get -s -o Debug::NoLocking=true upgrade` local detail=`apt-get -s -o Debug::NoLocking=true upgrade`
if [ "$1" = "--detail" ]; then if [ "$1" = "--detail" ]; then
printf "$detail" printf "$detail"
else else
short=`printf "%s" "$detail" | grep -c ^Inst` local short=`printf "%s" "$detail" | grep -c ^Inst`
printf "$short" printf "$short"
fi fi
fi fi
@ -104,7 +105,7 @@ __updates_available_detail() {
__updates_available() { __updates_available() {
local mycache="$BYOBU_RUN_DIR/cache.$BYOBU_BACKEND/updates-available" local mycache="$BYOBU_RUN_DIR/cache.$BYOBU_BACKEND/updates-available"
# If mycache is present, use it # If mycache is present, use it
[ -r $mycache ] && ___print_updates `$SED -n '/[^0-9]/s/ .*$//p' $mycache` [ -r $mycache ] && ___print_updates "$mycache"
# If we really need to do so (mycache doesn't exist, or the package database has changed), # If we really need to do so (mycache doesn't exist, or the package database has changed),
# background an update now # background an update now
___update_needed "$mycache" && ___update_cache "$mycache" ___update_needed "$mycache" && ___update_cache "$mycache"