Merge lp:~raphink/byobu/all into lp:byobu

[Raphaël Pinson]

[Raphaël Pinson (raphink)]

Since this branch contains the battery script as well as two new scripts, you can ignore the request to merge from the specific branch for battery_state (https://code.launchpad.net/~raphink/screen-profiles/353215/+merge/5109).

=== added file 'bin/battery_state'
--- bin/battery_state	1970-01-01 00:00:00 +0000
+++ bin/battery_state	2009-04-01 16:56:50 +0000
@@ -0,0 +1,86 @@
+#!/bin/sh -e
+#
+#  battery_state: print the state of the battery
+#  Copyright (C) 2009 Raphaël Pinson.
+#
+#  Authors: Raphaël Pinson <[e-mail]>
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+search () {
+   local str expr
+   str="$1"
+   expr="$2"
+   
+   echo "$str" | sed -n "s/${expr}/\1/p"
+}
+
+
+BATS=$(ls /proc/acpi/battery)
+NB=$(echo "$BATS" | wc -l)
+
+for bat in $BATS; do
+   if [ "$NB" -gt 1 ]; then
+      echo -n "$bat: "
+   fi
+
+   # read files once
+   infofile=$(cat "/proc/acpi/battery/$bat/info")
+   statefile=$(cat "/proc/acpi/battery/$bat/state")
+
+   present=$(search "$infofile" "present: *\(.*\)")
+
+   if [ "x${present}" = "xno" ]; then
+      echo "n/a"
+      break
+   fi
+
+   full=$(search "$infofile" "last full capacity: *\(.*\) m[AW]h")
+   warn=$(search "$infofile" "design capacity warning: \(.*\) m[AW]h")
+   low=$(search "$infofile" "design capacity low: \(.*\) m[AW]h")
+   
+   rem=$(search "$statefile" "remaining capacity: *\(.*\) m[AW]h")
+   if [ "$rem" -lt "$low" ]; then
+      color="\005{= r.}"
+   elif [ "$rem" -lt "$warn" ]; then
+      color="\005{= y.}"
+   else
+      color="\005{= g.}"
+   fi
+
+
+   percent=$(echo "100*$rem/$full" | bc)
+   state=$(search "$statefile" "charging state: *\(.*\)")
+
+   case $state in
+      charging)
+         sign="+"
+         ;;
+      discharging)
+         sign="-"
+         ;;
+      charged)
+         sign="="
+         ;;
+      *)
+         sign="$state"
+         ;; 
+   esac
+
+   echo "${color}|${sign}|\005{-}${percent}%"
+done
+
+

=== added file 'bin/nb-users'
--- bin/nb-users	1970-01-01 00:00:00 +0000
+++ bin/nb-users	2009-04-02 15:18:17 +0000
@@ -0,0 +1,23 @@
+#!/bin/sh -e
+#
+#  nb_users: print the number of users on the machine
+#  Copyright (C) 2009 Raphaël Pinson.
+#
+#  Authors: Raphaël Pinson <[e-mail]>
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+uptime | sed -e "s/.*, *\(.* user[s]*\), .*/\1/"
+

=== added file 'bin/uptime'
--- bin/uptime	1970-01-01 00:00:00 +0000
+++ bin/uptime	2009-04-02 15:18:17 +0000
@@ -0,0 +1,23 @@
+#!/bin/sh -e
+#
+#  uptime: condensed uptime of the machine
+#  Copyright (C) 2009 Raphaël Pinson.
+#
+#  Authors: Raphaël Pinson <[e-mail]>
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+uptime | sed -e "s/.* up *\(.*\), *.* user[s]*, .*/\1/; s/ day[s]*, */d/"
+