Merge lp:~zorun-42/byobu/fix into lp:byobu

[zorun]

Some small bugfixes / documentation enhancements.

[lp:~zorun-42/byobu/fix]

1720. By zorun on 2011-10-25

usr/lib/byobu/.shutil: fix incorrect use of 5165 in get_now, LP: #881437

=== modified file 'usr/lib/byobu/.shutil'
--- usr/lib/byobu/.shutil	2011-10-21 17:33:21 +0000
+++ usr/lib/byobu/.shutil	2011-10-25 14:02:24 +0000
@@ -269,9 +269,7 @@
 }
 
 get_now() {
-	if [ -n "${BASH_VERSION}" ] && [ -n "${SECONDS}" ]; then
-		_RET=${SECONDS}
-	elif [ -r /proc/uptime ]; then
+	if [ -r /proc/uptime ]; then
 		# return the integer part of the first item in /proc/uptime
 		local s c
 		read s c < /proc/uptime

=== modified file 'usr/lib/byobu/battery'
--- usr/lib/byobu/battery	2011-10-22 08:04:01 +0000
+++ usr/lib/byobu/battery	2011-10-25 14:02:24 +0000
@@ -26,10 +26,12 @@
 		cat "$bat/info"
 		cat "$bat/state"
 	done
+	# FIXME: do the same thing with the /sys interface
 }
 
 __battery() {
-	local bat line present sign state percent full rem color bcolor
+	local bat has_bat line present sign state percent full rem color bcolor
+	has_bat=""
 	for bat in $BATTERY /sys/class/power_supply/* /proc/acpi/battery/*; do
 		present=""; full=""; rem=""; state=""
 		case "$bat" in
@@ -40,7 +42,7 @@
 					full="$POWER_SUPPLY_CHARGE_FULL"
 					rem="$POWER_SUPPLY_CHARGE_NOW"
 					state="$POWER_SUPPLY_STATUS"
-					[ -n "$present" ] && [ -n "$full" ] && [ -n "$rem" ] && [ "$state" ] && break
+					[ "$present" = "1" ] && [ -n "$full" ] && [ -n "$rem" ] && [ -n "$state" ] && has_bat=1 && break
 				fi
 			;;
 			/proc/*)
@@ -64,28 +66,31 @@
 					esac
 					[ -n "$rem" -a -n "$state" ] && break
 				done < "$bat/state"
+				[ -n "$full" ] && [ -n "$rem" ] && [ -n "$state" ] && has_bat=1 && break
 			;;
 		esac
 	done
-	percent=$(((100*$rem)/$full))
-	if [ "$percent" -lt 33 ]; then
-		color="R k"
-		bcolor="b R k"
-	elif [ "$percent" -lt 67 ]; then
-		color="Y k"
-		bcolor="b Y k"
-	else
-		color="G k"
-		bcolor="b G k"
+	if [ "$has_bat" = "1" ]; then
+		percent=$(((100*$rem)/$full))
+		if [ "$percent" -lt 33 ]; then
+			color="R k"
+			bcolor="b R k"
+		elif [ "$percent" -lt 67 ]; then
+			color="Y k"
+			bcolor="b Y k"
+		else
+			color="G k"
+			bcolor="b G k"
+		fi
+		percent="$percent$PCT"
+		case $state in
+			charging|Charging|Unknown) sign="+" ;;
+			discharging|Discharging) sign="-" ;;
+			charged|Unknown|Full) sign="="; percent="" ;;
+			*) sign="$state" ;;
+		esac
+		color $bcolor; printf "%s" "$percent"; color -; color $color; printf "%s" "$sign"; color --
 	fi
-	percent="$percent$PCT"
-	case $state in
-		charging|Charging|Unknown) sign="+" ;;
-		discharging|Discharging) sign="-" ;;
-		charged|Unknown) sign="="; percent="" ;;
-		*) sign="$state" ;;
-	esac
-	color $bcolor; printf "%s" "$percent"; color -; color $color; printf "%s" "$sign"; color --
 }
 
 # vi: syntax=sh ts=4 noexpandtab

=== modified file 'usr/share/byobu/profiles/tmux'
--- usr/share/byobu/profiles/tmux	2011-10-10 16:22:51 +0000
+++ usr/share/byobu/profiles/tmux	2011-10-25 14:02:24 +0000
@@ -27,6 +27,8 @@
 
 # Change to Screen's ctrl-a escape sequence
 source /usr/share/doc/tmux/examples/screen-keys.conf
+# On Archlinux, this file is not under the same directory
+source /usr/share/tmux/screen-keys.conf
 
 # Byobu's Keybindings
 bind-key -n F1 new-window -k -t config byobu-config

=== modified file 'usr/share/byobu/status/statusrc'
--- usr/share/byobu/status/statusrc	2011-08-02 05:27:18 +0000
+++ usr/share/byobu/status/statusrc	2011-10-25 14:02:24 +0000
@@ -22,13 +22,39 @@
 
 # Configurations that you can override; if you leave these commented out,
 # Byobu will try to auto-detect them.
+
+# This should be auto-detected for most distro, but setting it here will save
+# some call to lsb_release and the like.
+#DISTRO=Ubuntu
+
+# Default: depends on the distro (which is either auto-detected, either set
+# via $DISTRO)
 #LOGO="\o/"
+
+# Default: /
 #MONITORED_DISK=/
+
+# Minimum disk throughput that triggers the notification (in kB/s)
+# Default: 50
 #DISK_IO_THRESHOLD=50
+
+# Default: eth0
 #MONITORED_INTERFACE=eth0
+
+# Unit used for network throughput (either bits per second or bytes per second)
+# Default: bits
+#NETWORK_UNITS=bytes
+
+# Minimum network throughput that triggers the notification (in kbit/s)
+# Default: 20
 #NETWORK_THRESHOLD=20
+
+# You can add an additional source of temperature here
 #MONITORED_TEMP=/proc/acpi/thermal_zone/THM0/temperature
+
+# Default: C
 #TEMP=F
-#DISTRO=Ubuntu
+
 #SERVICES="eucalyptus-nc|NC eucalyptus-cloud|CLC eucalyptus-walrus eucalyptus-cc|CC eucalyptus-sc|SC"
+
 #FAN=$(find /sys -type f -name fan1_input | head -n1)