Don't like ads? PRO users don't see any ads ;-)
Public Pastes
Guest

byobu patch for Arch

By: a guest on Feb 27th, 2011  |  syntax: Diff  |  size: 8.28 KB  |  hits: 184  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. diff -Naur byobu-3.29.old/etc/byobu/socketdir byobu-3.29/etc/byobu/socketdir
  2. --- byobu-3.29.old/etc/byobu/socketdir  2011-02-27 17:46:42.696667470 +0100
  3. +++ byobu-3.29/etc/byobu/socketdir      2011-02-27 17:47:35.220000874 +0100
  4. @@ -7,4 +7,4 @@
  5.  #  * the variable name is SOCKETDIR
  6.  #  * there is no space around the "="
  7.  #  * and that the path value is quoted
  8. -SOCKETDIR="/var/run/screen"
  9. +SOCKETDIR="/tmp/screens"
  10. diff -Naur byobu-3.29.old/etc/byobu/statusrc byobu-3.29/etc/byobu/statusrc
  11. --- byobu-3.29.old/etc/byobu/statusrc   2011-02-27 17:46:42.696667470 +0100
  12. +++ byobu-3.29/etc/byobu/statusrc       2011-02-27 19:23:23.486667886 +0100
  13. @@ -45,15 +45,16 @@
  14.  processes=0
  15.  raid=1
  16.  rcs_cost=0
  17. -reboot_required=1
  18. +reboot_required=0
  19.  release=1
  20. -services=1
  21. +services=0
  22.  swap=0
  23.  time=1
  24.  time_binary=0
  25.  time_utc=0
  26. +trash=0
  27.  users=0
  28. -updates_available=1
  29. +updates_available=0
  30.  uptime=1
  31.  whoami=1
  32.  wifi_quality=0
  33. @@ -67,4 +68,5 @@
  34.  #TEMP=F
  35.  #DISTRO=Ubuntu
  36.  #SERVICES="eucalyptus-nc|NC eucalyptus-cloud|CLC eucalyptus-walrus eucalyptus-cc|CC eucalyptus-sc|SC"
  37. +NETWORK_UNITS=bytes
  38.  # END_CUT_HERE
  39. diff -Naur byobu-3.29.old/usr/bin/byobu-config byobu-3.29/usr/bin/byobu-config
  40. --- byobu-3.29.old/usr/bin/byobu-config 2011-02-27 17:46:42.700000803 +0100
  41. +++ byobu-3.29/usr/bin/byobu-config     2011-02-27 18:38:27.233334223 +0100
  42. @@ -1,4 +1,4 @@
  43. -#!/usr/bin/python
  44. +#!/usr/bin/env python2
  45.  #
  46.  #    byobu-config
  47.  #    Copyright (C) 2008 Canonical Ltd.
  48. diff -Naur byobu-3.29.old/usr/bin/byobu-select-session byobu-3.29/usr/bin/byobu-select-session
  49. --- byobu-3.29.old/usr/bin/byobu-select-session 2011-02-27 17:46:42.700000803 +0100
  50. +++ byobu-3.29/usr/bin/byobu-select-session     2011-02-27 18:38:44.926667819 +0100
  51. @@ -1,4 +1,4 @@
  52. -#! /usr/bin/env python
  53. +#!/usr/bin/env python2
  54.  #
  55.  #    byobu-select-session
  56.  #    Copyright (C) 2010 Canonical Ltd.
  57. diff -Naur byobu-3.29.old/usr/lib/byobu/cpu_temp byobu-3.29/usr/lib/byobu/cpu_temp
  58. --- byobu-3.29.old/usr/lib/byobu/cpu_temp       2011-02-27 17:46:42.700000803 +0100
  59. +++ byobu-3.29/usr/lib/byobu/cpu_temp   2011-02-27 18:10:35.823337428 +0100
  60. @@ -23,6 +23,7 @@
  61.  [ "$UTF8" = "1" ] && ICON_C="℃" || ICON_C="C"
  62.  [ "$UTF8" = "1" ] && ICON_F="℉" || ICON_F="F"
  63.  
  64. +# Archlinux: this doesn't exist on recent linux kernel (aka Arch's current 2.6.37)
  65.  DIR="/proc/acpi/thermal_zone"
  66.  if [ "$1" = "--detail" ] && [ -d "$DIR" ]; then
  67.         for i in "$DIR"/*; do
  68. @@ -33,6 +34,7 @@
  69.         exit 0
  70.  fi
  71.  
  72. +# Archlinux: same here, /proc/acpi/ibm doesn't exist on Arch
  73.  for i in $MONITORED_TEMP /sys/class/hwmon/hwmon*/temp*_input /proc/acpi/ibm/thermal $DIR/*/temperature; do
  74.         case "$i" in
  75.                 *temp*_input)
  76. diff -Naur byobu-3.29.old/usr/lib/byobu/custom byobu-3.29/usr/lib/byobu/custom
  77. --- byobu-3.29.old/usr/lib/byobu/custom 2011-02-27 17:46:42.700000803 +0100
  78. +++ byobu-3.29/usr/lib/byobu/custom     2011-02-27 18:11:18.513334145 +0100
  79. @@ -23,7 +23,7 @@
  80.  [ -d "$DATA/bin" ] || exit 0
  81.  color 2>/dev/null || color() { true; }
  82.  
  83. -[ -d "/var/run/screen/S-$USER" ] && DIR="/var/run/screen/S-$USER" || DIR="$DATA"
  84. +[ -d "/tmp/screens/S-$USER" ] && DIR="/tmp/screens/S-$USER" || DIR="$DATA"
  85.  NOW=$(date +%s)
  86.  CACHE="$DIR/$PKG.custom"
  87.  
  88. diff -Naur byobu-3.29.old/usr/lib/byobu/disk_io byobu-3.29/usr/lib/byobu/disk_io
  89. --- byobu-3.29.old/usr/lib/byobu/disk_io        2011-02-27 17:46:42.700000803 +0100
  90. +++ byobu-3.29/usr/lib/byobu/disk_io    2011-02-27 18:13:48.966667471 +0100
  91. @@ -40,7 +40,7 @@
  92.         exit 0
  93.  fi
  94.  
  95. -[ -d "/var/run/screen/S-$USER" ] && DIR="/var/run/screen/S-$USER" || DIR="$DATA"
  96. +[ -d "/tmp/screens/S-$USER" ] && DIR="/tmp/screens/S-$USER" || DIR="$DATA"
  97.  t2=`date +%s`
  98.  for i in "read" "write"; do
  99.         cache="$DIR/$PKG.disk_$i"
  100. diff -Naur byobu-3.29.old/usr/lib/byobu/hostname byobu-3.29/usr/lib/byobu/hostname
  101. --- byobu-3.29.old/usr/lib/byobu/hostname       2011-02-27 17:46:42.700000803 +0100
  102. +++ byobu-3.29/usr/lib/byobu/hostname   2011-02-27 18:17:17.010001103 +0100
  103. @@ -29,4 +29,4 @@
  104.  . "$DATA/status"
  105.  [ "$whoami" = "1" ] && at="@"
  106.  
  107. -printf "$(color bold2)%s%s$(color -)" "$at" $(hostname -s 2>/dev/null || hostname)
  108. +printf "$(color bold2)%s%s$(color -)" "$at" $(hostname 2>/dev/null)
  109. diff -Naur byobu-3.29.old/usr/lib/byobu/ip_address byobu-3.29/usr/lib/byobu/ip_address
  110. --- byobu-3.29.old/usr/lib/byobu/ip_address     2011-02-27 17:46:42.700000803 +0100
  111. +++ byobu-3.29/usr/lib/byobu/ip_address 2011-02-27 17:57:30.266667465 +0100
  112. @@ -23,8 +23,8 @@
  113.  
  114.  if [ "$1" = "--detail" ]; then
  115.         [ -x /sbin/ifconfig ] && /sbin/ifconfig
  116. -       /sbin/ip -4 addr list
  117. -       /sbin/ip -6 addr list
  118. +       /usr/sbin/ip -4 addr list
  119. +       /usr/sbin/ip -6 addr list
  120.         exit 0
  121.  fi
  122.  
  123. @@ -44,14 +44,14 @@
  124.  
  125.  case "$IPV6" in
  126.         1|true|yes)
  127. -               ipaddr=$(LC_ALL=C /sbin/ip -6 addr list dev "$interface" scope global)
  128. +               ipaddr=$(LC_ALL=C /usr/sbin/ip -6 addr list dev "$interface" scope global)
  129.                 # Print 'None' if we have no global address
  130.                 [ -z "$ipaddr" ] && ipaddr="None"
  131.                 ipaddr=${ipaddr#* inet6 }
  132.                 ipaddr=${ipaddr%%/*}
  133.         ;;
  134.         *)
  135. -               ipaddr=$(LC_ALL=C /sbin/ip -4 addr list dev "$interface" scope global)
  136. +               ipaddr=$(LC_ALL=C /usr/sbin/ip -4 addr list dev "$interface" scope global)
  137.                 ipaddr=${ipaddr#* inet }
  138.                 ipaddr=${ipaddr%%/*}
  139.         ;;
  140. diff -Naur byobu-3.29.old/usr/lib/byobu/network byobu-3.29/usr/lib/byobu/network
  141. --- byobu-3.29.old/usr/lib/byobu/network        2011-02-27 17:46:42.700000803 +0100
  142. +++ byobu-3.29/usr/lib/byobu/network    2011-02-27 18:22:19.383334334 +0100
  143. @@ -35,7 +35,7 @@
  144.         exit 0
  145.  fi
  146.  
  147. -[ -d "/var/run/screen/S-$USER" ] && DIR="/var/run/screen/S-$USER" || DIR="$DATA"
  148. +[ -d "/tmp/screens/S-$USER" ] && DIR="/tmp/screens/S-$USER" || DIR="$DATA"
  149.  t2=`date +%s`
  150.  for i in up down; do
  151.         unit="kbps"
  152. diff -Naur byobu-3.29.old/usr/lib/byobu/reboot_required byobu-3.29/usr/lib/byobu/reboot_required
  153. --- byobu-3.29.old/usr/lib/byobu/reboot_required        2011-02-27 17:46:42.700000803 +0100
  154. +++ byobu-3.29/usr/lib/byobu/reboot_required    2011-02-27 17:55:24.426667469 +0100
  155. @@ -22,7 +22,7 @@
  156.  color 2>/dev/null || color() { true; }
  157.  
  158.  reboot="/var/run/reboot-required"
  159. -[ -d "/var/run/screen/S-$USER" ] && DIR="/var/run/screen/S-$USER" || DIR="$DATA"
  160. +[ -d "/tmp/screens/S-$USER" ] && DIR="/tmp/screens/S-$USER" || DIR="$DATA"
  161.  reload="$DIR/$PKG.reload-required"
  162.  case "$1" in
  163.         --detail)
  164. diff -Naur byobu-3.29.old/usr/lib/byobu/release byobu-3.29/usr/lib/byobu/release
  165. --- byobu-3.29.old/usr/lib/byobu/release        2011-02-27 17:46:42.700000803 +0100
  166. +++ byobu-3.29/usr/lib/byobu/release    2011-02-27 18:27:24.766667660 +0100
  167. @@ -38,6 +38,9 @@
  168.                 Debian*)
  169.                         DISTRO="Debian $(cat /etc/debian_version)"
  170.                 ;;
  171. +               Arch*)
  172. +                       DISTRO="ArchLinux"
  173. +               ;;
  174.                 *)
  175.                         DISTRO=$(echo "$issue" | sed "s/ [^0-9]* / /" | awk '{print $1 " " $2}')
  176.                 ;;
  177. diff -Naur byobu-3.29.old/usr/lib/byobu/updates_available byobu-3.29/usr/lib/byobu/updates_available
  178. --- byobu-3.29.old/usr/lib/byobu/updates_available      2011-02-27 17:46:42.700000803 +0100
  179. +++ byobu-3.29/usr/lib/byobu/updates_available  2011-02-27 18:35:00.633334391 +0100
  180. @@ -17,6 +17,8 @@
  181.  #    You should have received a copy of the GNU General Public License
  182.  #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  183.  
  184. +# Archlinux: this is clearly apt-dependant, thus unadapted for Arch
  185. +
  186.  PKG="byobu"
  187.  DATA="$HOME/.$PKG"
  188.  color 2>/dev/null || color() { true; }
  189. @@ -81,7 +83,7 @@
  190.  # I would welcome contributions from other distros to make this
  191.  # more distro-agnostic.
  192.  
  193. -[ -d "/var/run/screen/S-$USER" ] && DIR="/var/run/screen/S-$USER" || DIR="$DATA"
  194. +[ -d "/tmp/screens/S-$USER" ] && DIR="/tmp/screens/S-$USER" || DIR="$DATA"
  195.  mycache="$DIR/$PKG.updates-available"
  196.  
  197.  # If mycache is present, use it
  198. diff -Naur byobu-3.29.old/usr/lib/byobu/wifi_quality byobu-3.29/usr/lib/byobu/wifi_quality
  199. --- byobu-3.29.old/usr/lib/byobu/wifi_quality   2011-02-27 17:46:42.700000803 +0100
  200. +++ byobu-3.29/usr/lib/byobu/wifi_quality       2011-02-27 17:51:57.373334138 +0100
  201. @@ -22,11 +22,11 @@
  202.  [ "$UTF8" = "1" ] && ICON="⚚" || ICON=
  203.  
  204.  if [ "$1" = "--detail" ]; then
  205. -       /sbin/iwconfig 2>/dev/null
  206. +       /usr/sbin/iwconfig 2>/dev/null
  207.         exit 0
  208.  fi
  209.  
  210. -iwconfig=`/sbin/iwconfig $MONITORED_NETWORK 2>/dev/null`
  211. +iwconfig=`/usr/sbin/iwconfig $MONITORED_NETWORK 2>/dev/null`
  212.  bitrate=`echo "$iwconfig" | grep "Bit Rate." | sed -e "s/^.*Bit Rate.//" -e "s/ .*$//g"`
  213.  [ -z "$bitrate" ] && bitrate="0"
  214.  quality=`echo "$iwconfig" | grep "Link Quality." | sed -e "s/^.*Link Quality.//" -e "s/ .*$//g"`
create a new version of this paste RAW Paste Data