Date: Friday, May 22, 2015 @ 22:38:12 Author: kkeen Revision: 133982 archrelease: copy trunk to community-i686, community-x86_64
Added: spectrwm/repos/community-i686/LICENSE (from rev 133981, spectrwm/trunk/LICENSE) spectrwm/repos/community-i686/PKGBUILD (from rev 133981, spectrwm/trunk/PKGBUILD) spectrwm/repos/community-i686/baraction.sh (from rev 133981, spectrwm/trunk/baraction.sh) spectrwm/repos/community-i686/spectrwm-no-preload (from rev 133981, spectrwm/trunk/spectrwm-no-preload) spectrwm/repos/community-x86_64/LICENSE (from rev 133981, spectrwm/trunk/LICENSE) spectrwm/repos/community-x86_64/PKGBUILD (from rev 133981, spectrwm/trunk/PKGBUILD) spectrwm/repos/community-x86_64/baraction.sh (from rev 133981, spectrwm/trunk/baraction.sh) spectrwm/repos/community-x86_64/spectrwm-no-preload (from rev 133981, spectrwm/trunk/spectrwm-no-preload) Deleted: spectrwm/repos/community-i686/LICENSE spectrwm/repos/community-i686/PKGBUILD spectrwm/repos/community-i686/baraction.sh spectrwm/repos/community-i686/spectrwm-no-preload spectrwm/repos/community-x86_64/LICENSE spectrwm/repos/community-x86_64/PKGBUILD spectrwm/repos/community-x86_64/baraction.sh spectrwm/repos/community-x86_64/spectrwm-no-preload --------------------------------------+ /LICENSE | 94 ++++++++++++++++++ /PKGBUILD | 134 ++++++++++++++++++++++++++ /baraction.sh | 164 +++++++++++++++++++++++++++++++++ /spectrwm-no-preload | 4 community-i686/LICENSE | 47 --------- community-i686/PKGBUILD | 78 --------------- community-i686/baraction.sh | 82 ---------------- community-i686/spectrwm-no-preload | 2 community-x86_64/LICENSE | 47 --------- community-x86_64/PKGBUILD | 78 --------------- community-x86_64/baraction.sh | 82 ---------------- community-x86_64/spectrwm-no-preload | 2 12 files changed, 396 insertions(+), 418 deletions(-) Deleted: community-i686/LICENSE =================================================================== --- community-i686/LICENSE 2015-05-22 20:37:45 UTC (rev 133981) +++ community-i686/LICENSE 2015-05-22 20:38:12 UTC (rev 133982) @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2009 Marco Peereboom <ma...@peereboom.us> - * Copyright (c) 2009 Ryan McBride <mcbr...@countersiege.com> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -/* - * Much code and ideas taken from dwm under the following license: - * MIT/X Consortium License - * - * 2006-2008 Anselm R Garbe <garbeam at gmail dot com> - * 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com> - * 2006-2007 Jukka Salmi <jukka at salmi dot ch> - * 2007 Premysl Hruby <dfenze at gmail dot com> - * 2007 Szabolcs Nagy <nszabolcs at gmail dot com> - * 2007 Christof Musik <christof at sendfax dot de> - * 2007-2008 Enno Gottox Boland <gottox at s01 dot de> - * 2007-2008 Peter Hartlich <sgkkr at hartlich dot com> - * 2008 Martin Hurton <martin dot hurton at gmail dot com> - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ Copied: spectrwm/repos/community-i686/LICENSE (from rev 133981, spectrwm/trunk/LICENSE) =================================================================== --- community-i686/LICENSE (rev 0) +++ community-i686/LICENSE 2015-05-22 20:38:12 UTC (rev 133982) @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2009 Marco Peereboom <ma...@peereboom.us> + * Copyright (c) 2009 Ryan McBride <mcbr...@countersiege.com> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/* + * Much code and ideas taken from dwm under the following license: + * MIT/X Consortium License + * + * 2006-2008 Anselm R Garbe <garbeam at gmail dot com> + * 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com> + * 2006-2007 Jukka Salmi <jukka at salmi dot ch> + * 2007 Premysl Hruby <dfenze at gmail dot com> + * 2007 Szabolcs Nagy <nszabolcs at gmail dot com> + * 2007 Christof Musik <christof at sendfax dot de> + * 2007-2008 Enno Gottox Boland <gottox at s01 dot de> + * 2007-2008 Peter Hartlich <sgkkr at hartlich dot com> + * 2008 Martin Hurton <martin dot hurton at gmail dot com> + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2015-05-22 20:37:45 UTC (rev 133981) +++ community-i686/PKGBUILD 2015-05-22 20:38:12 UTC (rev 133982) @@ -1,78 +0,0 @@ -# $Id$ -# Maintainer: Kyle Keen <keen...@gmail.com> -# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> - -pkgname=spectrwm -pkgver=2.6.2 -pkgrel=1 -pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way." -arch=('i686' 'x86_64') -url="http://www.spectrwm.org" -_watch="https://opensource.conformal.com/snapshots/spectrwm/" -license=('custom:ISC') -depends=('dmenu' 'xcb-util' 'xcb-util-wm' 'xcb-util-keysyms' 'libxrandr' 'libxft' 'libxcursor' 'profont') -replaces=('scrotwm') -makedepends=('libxt') -optdepends=('scrot: screenshots' - 'xlockmore: great screenlocker' - 'terminus-font: great font') -backup=(etc/spectrwm.conf) - -# the +2.6.0 linux makefile does not build -# so download and use the 2.5.1 makefile until this is fixed - -source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz \ - http://opensource.conformal.com/snapshots/$pkgname/$pkgname-2.5.1.tgz \ - LICENSE \ - baraction.sh \ - spectrwm-no-preload) -md5sums=('eba7cba0c85706435657f744bf9086bc' - 'd9aec3342920e31cbe60f1032571043a' - 'a67cfe51079481e5b0eab1ad371379e3' - '950d663692e1da56e0ac864c6c3ed80e' - '974d109ce0af39cc73936d5efd682480') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - sed -i 's|\"/usr/local/lib/libswmhack.so\"|\"libswmhack.so\"|' spectrwm.c - sed -i 's/verbose_layout = false;/verbose_layout = true;/' spectrwm.c - sed -i 's/# modkey = Mod1/modkey = Mod4/' spectrwm.conf - # crashes if defaults can't be found, use less massive defaults - sed -i 's/-\*-terminus-medium-\*-\*-\*-\*/-*-profont-*-*-*-*-12/' spectrwm.conf - #sed -i 's/# program[lock].*/program[lock] = slock/' spectrwm.conf - - # see spectrwm FS#403 - sed -i 's/setconfspawn("lock".*/setconfspawn("lock", "xlock", SWM_SPAWN_OPTIONAL);/' spectrwm.c - - cd linux - cp "$srcdir/$pkgname-2.5.1/linux/Makefile" ./ - make PREFIX="/usr" -} - -package() { - cd "$srcdir/$pkgname-$pkgver/linux" - make PREFIX="/usr" DESTDIR="$pkgdir" install - install -Dm644 spectrwm.desktop "$pkgdir/usr/share/xsessions/spectrwm.desktop" - cd .. - install -Dm644 spectrwm.conf "$pkgdir/etc/spectrwm.conf" - install -Dm755 screenshot.sh "$pkgdir/usr/share/spectrwm/screenshot.sh" - mkdir -p "$pkgdir/etc/spectrwm" - cp spectrwm_*.conf "$pkgdir/etc/spectrwm/" - cd "$srcdir" - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - install -Dm755 baraction.sh "$pkgdir/usr/share/spectrwm/baraction.sh" - install -Dm755 spectrwm-no-preload "$pkgdir/usr/bin/spectrwm-no-preload" - - #ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so.0" - #ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so" - - # fix this for real in the makefile - rm "$pkgdir/usr/bin/scrotwm" - ln -s "/usr/bin/spectrwm" "$pkgdir/usr/bin/scrotwm" - mkdir -p "$pkgdir"/usr/share/man/{es,it,pt,ru}/man1/ - mv "$pkgdir/usr/share/man/man1/spectrwm_es.1" "$pkgdir/usr/share/man/es/man1/" - mv "$pkgdir/usr/share/man/man1/spectrwm_it.1" "$pkgdir/usr/share/man/it/man1/" - mv "$pkgdir/usr/share/man/man1/spectrwm_pt.1" "$pkgdir/usr/share/man/pt/man1/" - mv "$pkgdir/usr/share/man/man1/spectrwm_ru.1" "$pkgdir/usr/share/man/ru/man1/" -} Copied: spectrwm/repos/community-i686/PKGBUILD (from rev 133981, spectrwm/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2015-05-22 20:38:12 UTC (rev 133982) @@ -0,0 +1,67 @@ +# $Id$ +# Maintainer: Kyle Keen <keen...@gmail.com> +# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> + +pkgname=spectrwm +pkgver=2.7.0 +pkgrel=1 +pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way." +arch=('i686' 'x86_64') +url="http://www.spectrwm.org" +_watch="https://opensource.conformal.com/snapshots/spectrwm/" +license=('custom:ISC') +depends=('dmenu' 'xcb-util' 'xcb-util-wm' 'xcb-util-keysyms' 'libxrandr' 'libxft' 'libxcursor' 'profont') +replaces=('scrotwm') +makedepends=('libxt') +optdepends=('scrot: screenshots' + 'xlockmore: great screenlocker' + 'terminus-font: great font') +backup=(etc/spectrwm.conf) + +source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz \ + LICENSE \ + baraction.sh \ + spectrwm-no-preload) +md5sums=('a638207b5e20ad1bfaf0a8ae61a69eef' + 'a67cfe51079481e5b0eab1ad371379e3' + '950d663692e1da56e0ac864c6c3ed80e' + '974d109ce0af39cc73936d5efd682480') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + sed -i 's|\"/usr/local/lib/libswmhack.so\"|\"libswmhack.so\"|' spectrwm.c + sed -i 's/verbose_layout = false;/verbose_layout = true;/' spectrwm.c + sed -i 's/# modkey = Mod1/modkey = Mod4/' spectrwm.conf + # crashes if defaults can't be found, use less massive defaults + sed -i 's/-\*-terminus-medium-\*-\*-\*-\*/-*-profont-*-*-*-*-12/' spectrwm.conf + #sed -i 's/# program[lock].*/program[lock] = slock/' spectrwm.conf + + # see spectrwm FS#403 + sed -i 's/setconfspawn("lock".*/setconfspawn("lock", "xlock", SWM_SPAWN_OPTIONAL);/' spectrwm.c + + cd linux + make PREFIX="/usr" +} + +package() { + cd "$srcdir/$pkgname-$pkgver/linux" + make PREFIX="/usr" DESTDIR="$pkgdir" install + install -Dm644 spectrwm.desktop "$pkgdir/usr/share/xsessions/spectrwm.desktop" + cd .. + install -Dm644 spectrwm.conf "$pkgdir/etc/spectrwm.conf" + install -Dm755 screenshot.sh "$pkgdir/usr/share/spectrwm/screenshot.sh" + mkdir -p "$pkgdir/etc/spectrwm" + cp spectrwm_*.conf "$pkgdir/etc/spectrwm/" + cd "$srcdir" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm755 baraction.sh "$pkgdir/usr/share/spectrwm/baraction.sh" + install -Dm755 spectrwm-no-preload "$pkgdir/usr/bin/spectrwm-no-preload" + + #ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so.0" + #ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so" + + # fix this for real in the makefile + rm "$pkgdir/usr/bin/scrotwm" + ln -s "/usr/bin/spectrwm" "$pkgdir/usr/bin/scrotwm" +} Deleted: community-i686/baraction.sh =================================================================== --- community-i686/baraction.sh 2015-05-22 20:37:45 UTC (rev 133981) +++ community-i686/baraction.sh 2015-05-22 20:38:12 UTC (rev 133982) @@ -1,82 +0,0 @@ -#!/bin/bash -# baraction.sh for spectrwm status bar -# From http://wiki.archlinux.org/index.php/Scrotwm - -SLEEP_SEC=5 -#loops forever outputting a line every SLEEP_SEC secs -while :; do - - eval $(cat /proc/acpi/battery/BAT0/state | awk '/charging state/ {printf "BAT_CHGSTATE=%s;", $3}; /remaining capacity/ {printf "BAT_REMNG=%s;",$3}; /present rate/ {printf "BAT_RATE=%s;",$3};' -) - eval $(cat /proc/acpi/battery/BAT0/info | awk '/present/ {printf "BAT_PRESENT=%s;", $2}; /last full capacity/ {printf "BAT_LASTFULL=%s;",$4};' -) - - BAT_REMNG_WH=`echo "scale=1; a=($BAT_REMNG+50)/1000; print a" | bc -l` - BAT_RATE_W=`echo "scale=1; a=($BAT_RATE+50)/1000; print a" | bc -l` - BCSCRIPT="scale=0; a=(100*$BAT_REMNG / $BAT_LASTFULL); print a" - BAT_PCT=`echo $BCSCRIPT | bc -l`% - - case $BAT_PRESENT in - no) - POWER_STR="AC, NO BATTERY" - ;; - yes) - - case $BAT_CHGSTATE in - charged) - #on ac - AC_STATUS="ON AC" - TIME_REMNG="N/A" - POWER_STR="$AC_STATUS $BAT_CHGSTATE $BAT_PCT" - ;; - charging) - #on ac - AC_STATUS="ON AC" - BCSCRIPT="scale=1; a=(60*($BAT_LASTFULL - $BAT_REMNG) / $BAT_RATE); print a" - TIMETOFULL_MIN=`echo $BCSCRIPT | bc -l` - POWER_STR="$AC_STATUS $BAT_CHGSTATE $BAT_PCT C="$BAT_REMNG_WH"Wh Rate="$BAT_RATE_W"W TTF="$TIMETOFULL_MIN"min" - ;; - discharging) - AC_STATUS="ON BATT" - TIME_REMNG_MIN=`echo "scale=0; a=(60*$BAT_REMNG / $BAT_RATE); print a" | bc -l` - TIME_REMNG_HH=`echo "scale=0; a=($BAT_REMNG / $BAT_RATE); if (a<10) {print "0"; print a} else {print a}" | bc -l` - - TIME_REMNG_MM=`echo "scale=0; a=($TIME_REMNG_MIN-60*$TIME_REMNG_HH); if (a<10) {print "0"; print a} else {print a}" | bc -l` - POWER_STR="$AC_STATUS $BAT_PCT C="$BAT_REMNG_WH"Wh P="$BAT_RATE_W"W R="$TIME_REMNG_HH":"$TIME_REMNG_MM - ;; - *) - POWER_STR=$BAT_CHGSTATE - ;; - esac - - ;; - *) - POWER_STR="error" - ;; - esac - - #spectrwm bar_print can't handle UTF-8 characters, such as degree symbol - #Core 0: +67.0°C (crit = +100.0°C) - eval $(sensors 2>/dev/null | sed s/[°+]//g | awk '/^Core 0/ {printf "CORE0TEMP=%s;", $3}; /^Core 1/ {printf "CORE1TEMP=%s;",$3}; /^fan1/ {printf "FANSPD=%s;",$2};' -) - TEMP_STR="Tcpu=$CORE0TEMP,$CORE1TEMP F=$FANSPD" - - WLAN_ESSID=$(iwconfig wlan0 | awk -F "\"" '/wlan0/ { print $2 }') - eval $(cat /proc/net/wireless | sed s/[.]//g | awk '/wlan0/ {printf "WLAN_QULTY=%s; WLAN_SIGNL=%s; WLAN_NOISE=%s", $3,$4,$5};' -) - BCSCRIPT="scale=0;a=100*$WLAN_QULTY/70;print a" - WLAN_QPCT=`echo $BCSCRIPT | bc -l` - WLAN_POWER=`iwconfig 2>/dev/null| grep "Tx-Power"| awk {'print $4'}|sed s/Tx-Power=//` - WLAN_STR="$WLAN_ESSID: Q=$WLAN_QPCT% S/N="$WLAN_SIGNL"/"$WLAN_NOISE"dBm T="$WLAN_POWER"dBm" - - CPUFREQ_STR=`echo "Freq:"$(cat /proc/cpuinfo | grep 'cpu MHz' | sed 's/.*: //g; s/\..*//g;')` - CPULOAD_STR="Load:$(uptime | sed 's/.*://; s/,//g')" - - eval $(awk '/^MemTotal/ {printf "MTOT=%s;", $2}; /^MemFree/ {printf "MFREE=%s;",$2}' /proc/meminfo) - MUSED=$(( $MTOT - $MFREE )) - MUSEDPT=$(( ($MUSED * 100) / $MTOT )) - MEM_STR="Mem:${MUSEDPT}%" - - echo -e "$POWER_STR $TEMP_STR $CPUFREQ_STR $CPULOAD_STR $MEM_STR $WLAN_STR" - #alternatively if you prefer a different date format - #DATE_STR=`date +"%H:%M %a %d %b` - #echo -e "$DATE_STR $POWER_STR $TEMP_STR $CPUFREQ_STR $CPULOAD_STR $MEM_STR $WLAN_STR" - - sleep $SLEEP_SEC -done Copied: spectrwm/repos/community-i686/baraction.sh (from rev 133981, spectrwm/trunk/baraction.sh) =================================================================== --- community-i686/baraction.sh (rev 0) +++ community-i686/baraction.sh 2015-05-22 20:38:12 UTC (rev 133982) @@ -0,0 +1,82 @@ +#!/bin/bash +# baraction.sh for spectrwm status bar +# From http://wiki.archlinux.org/index.php/Scrotwm + +SLEEP_SEC=5 +#loops forever outputting a line every SLEEP_SEC secs +while :; do + + eval $(cat /proc/acpi/battery/BAT0/state | awk '/charging state/ {printf "BAT_CHGSTATE=%s;", $3}; /remaining capacity/ {printf "BAT_REMNG=%s;",$3}; /present rate/ {printf "BAT_RATE=%s;",$3};' -) + eval $(cat /proc/acpi/battery/BAT0/info | awk '/present/ {printf "BAT_PRESENT=%s;", $2}; /last full capacity/ {printf "BAT_LASTFULL=%s;",$4};' -) + + BAT_REMNG_WH=`echo "scale=1; a=($BAT_REMNG+50)/1000; print a" | bc -l` + BAT_RATE_W=`echo "scale=1; a=($BAT_RATE+50)/1000; print a" | bc -l` + BCSCRIPT="scale=0; a=(100*$BAT_REMNG / $BAT_LASTFULL); print a" + BAT_PCT=`echo $BCSCRIPT | bc -l`% + + case $BAT_PRESENT in + no) + POWER_STR="AC, NO BATTERY" + ;; + yes) + + case $BAT_CHGSTATE in + charged) + #on ac + AC_STATUS="ON AC" + TIME_REMNG="N/A" + POWER_STR="$AC_STATUS $BAT_CHGSTATE $BAT_PCT" + ;; + charging) + #on ac + AC_STATUS="ON AC" + BCSCRIPT="scale=1; a=(60*($BAT_LASTFULL - $BAT_REMNG) / $BAT_RATE); print a" + TIMETOFULL_MIN=`echo $BCSCRIPT | bc -l` + POWER_STR="$AC_STATUS $BAT_CHGSTATE $BAT_PCT C="$BAT_REMNG_WH"Wh Rate="$BAT_RATE_W"W TTF="$TIMETOFULL_MIN"min" + ;; + discharging) + AC_STATUS="ON BATT" + TIME_REMNG_MIN=`echo "scale=0; a=(60*$BAT_REMNG / $BAT_RATE); print a" | bc -l` + TIME_REMNG_HH=`echo "scale=0; a=($BAT_REMNG / $BAT_RATE); if (a<10) {print "0"; print a} else {print a}" | bc -l` + + TIME_REMNG_MM=`echo "scale=0; a=($TIME_REMNG_MIN-60*$TIME_REMNG_HH); if (a<10) {print "0"; print a} else {print a}" | bc -l` + POWER_STR="$AC_STATUS $BAT_PCT C="$BAT_REMNG_WH"Wh P="$BAT_RATE_W"W R="$TIME_REMNG_HH":"$TIME_REMNG_MM + ;; + *) + POWER_STR=$BAT_CHGSTATE + ;; + esac + + ;; + *) + POWER_STR="error" + ;; + esac + + #spectrwm bar_print can't handle UTF-8 characters, such as degree symbol + #Core 0: +67.0°C (crit = +100.0°C) + eval $(sensors 2>/dev/null | sed s/[°+]//g | awk '/^Core 0/ {printf "CORE0TEMP=%s;", $3}; /^Core 1/ {printf "CORE1TEMP=%s;",$3}; /^fan1/ {printf "FANSPD=%s;",$2};' -) + TEMP_STR="Tcpu=$CORE0TEMP,$CORE1TEMP F=$FANSPD" + + WLAN_ESSID=$(iwconfig wlan0 | awk -F "\"" '/wlan0/ { print $2 }') + eval $(cat /proc/net/wireless | sed s/[.]//g | awk '/wlan0/ {printf "WLAN_QULTY=%s; WLAN_SIGNL=%s; WLAN_NOISE=%s", $3,$4,$5};' -) + BCSCRIPT="scale=0;a=100*$WLAN_QULTY/70;print a" + WLAN_QPCT=`echo $BCSCRIPT | bc -l` + WLAN_POWER=`iwconfig 2>/dev/null| grep "Tx-Power"| awk {'print $4'}|sed s/Tx-Power=//` + WLAN_STR="$WLAN_ESSID: Q=$WLAN_QPCT% S/N="$WLAN_SIGNL"/"$WLAN_NOISE"dBm T="$WLAN_POWER"dBm" + + CPUFREQ_STR=`echo "Freq:"$(cat /proc/cpuinfo | grep 'cpu MHz' | sed 's/.*: //g; s/\..*//g;')` + CPULOAD_STR="Load:$(uptime | sed 's/.*://; s/,//g')" + + eval $(awk '/^MemTotal/ {printf "MTOT=%s;", $2}; /^MemFree/ {printf "MFREE=%s;",$2}' /proc/meminfo) + MUSED=$(( $MTOT - $MFREE )) + MUSEDPT=$(( ($MUSED * 100) / $MTOT )) + MEM_STR="Mem:${MUSEDPT}%" + + echo -e "$POWER_STR $TEMP_STR $CPUFREQ_STR $CPULOAD_STR $MEM_STR $WLAN_STR" + #alternatively if you prefer a different date format + #DATE_STR=`date +"%H:%M %a %d %b` + #echo -e "$DATE_STR $POWER_STR $TEMP_STR $CPUFREQ_STR $CPULOAD_STR $MEM_STR $WLAN_STR" + + sleep $SLEEP_SEC +done Deleted: community-i686/spectrwm-no-preload =================================================================== --- community-i686/spectrwm-no-preload 2015-05-22 20:37:45 UTC (rev 133981) +++ community-i686/spectrwm-no-preload 2015-05-22 20:38:12 UTC (rev 133982) @@ -1,2 +0,0 @@ -#!/bin/sh -exec env -u LD_PRELOAD $@ Copied: spectrwm/repos/community-i686/spectrwm-no-preload (from rev 133981, spectrwm/trunk/spectrwm-no-preload) =================================================================== --- community-i686/spectrwm-no-preload (rev 0) +++ community-i686/spectrwm-no-preload 2015-05-22 20:38:12 UTC (rev 133982) @@ -0,0 +1,2 @@ +#!/bin/sh +exec env -u LD_PRELOAD $@ Deleted: community-x86_64/LICENSE =================================================================== --- community-x86_64/LICENSE 2015-05-22 20:37:45 UTC (rev 133981) +++ community-x86_64/LICENSE 2015-05-22 20:38:12 UTC (rev 133982) @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2009 Marco Peereboom <ma...@peereboom.us> - * Copyright (c) 2009 Ryan McBride <mcbr...@countersiege.com> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -/* - * Much code and ideas taken from dwm under the following license: - * MIT/X Consortium License - * - * 2006-2008 Anselm R Garbe <garbeam at gmail dot com> - * 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com> - * 2006-2007 Jukka Salmi <jukka at salmi dot ch> - * 2007 Premysl Hruby <dfenze at gmail dot com> - * 2007 Szabolcs Nagy <nszabolcs at gmail dot com> - * 2007 Christof Musik <christof at sendfax dot de> - * 2007-2008 Enno Gottox Boland <gottox at s01 dot de> - * 2007-2008 Peter Hartlich <sgkkr at hartlich dot com> - * 2008 Martin Hurton <martin dot hurton at gmail dot com> - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ Copied: spectrwm/repos/community-x86_64/LICENSE (from rev 133981, spectrwm/trunk/LICENSE) =================================================================== --- community-x86_64/LICENSE (rev 0) +++ community-x86_64/LICENSE 2015-05-22 20:38:12 UTC (rev 133982) @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2009 Marco Peereboom <ma...@peereboom.us> + * Copyright (c) 2009 Ryan McBride <mcbr...@countersiege.com> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/* + * Much code and ideas taken from dwm under the following license: + * MIT/X Consortium License + * + * 2006-2008 Anselm R Garbe <garbeam at gmail dot com> + * 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com> + * 2006-2007 Jukka Salmi <jukka at salmi dot ch> + * 2007 Premysl Hruby <dfenze at gmail dot com> + * 2007 Szabolcs Nagy <nszabolcs at gmail dot com> + * 2007 Christof Musik <christof at sendfax dot de> + * 2007-2008 Enno Gottox Boland <gottox at s01 dot de> + * 2007-2008 Peter Hartlich <sgkkr at hartlich dot com> + * 2008 Martin Hurton <martin dot hurton at gmail dot com> + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2015-05-22 20:37:45 UTC (rev 133981) +++ community-x86_64/PKGBUILD 2015-05-22 20:38:12 UTC (rev 133982) @@ -1,78 +0,0 @@ -# $Id$ -# Maintainer: Kyle Keen <keen...@gmail.com> -# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> - -pkgname=spectrwm -pkgver=2.6.2 -pkgrel=1 -pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way." -arch=('i686' 'x86_64') -url="http://www.spectrwm.org" -_watch="https://opensource.conformal.com/snapshots/spectrwm/" -license=('custom:ISC') -depends=('dmenu' 'xcb-util' 'xcb-util-wm' 'xcb-util-keysyms' 'libxrandr' 'libxft' 'libxcursor' 'profont') -replaces=('scrotwm') -makedepends=('libxt') -optdepends=('scrot: screenshots' - 'xlockmore: great screenlocker' - 'terminus-font: great font') -backup=(etc/spectrwm.conf) - -# the +2.6.0 linux makefile does not build -# so download and use the 2.5.1 makefile until this is fixed - -source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz \ - http://opensource.conformal.com/snapshots/$pkgname/$pkgname-2.5.1.tgz \ - LICENSE \ - baraction.sh \ - spectrwm-no-preload) -md5sums=('eba7cba0c85706435657f744bf9086bc' - 'd9aec3342920e31cbe60f1032571043a' - 'a67cfe51079481e5b0eab1ad371379e3' - '950d663692e1da56e0ac864c6c3ed80e' - '974d109ce0af39cc73936d5efd682480') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - sed -i 's|\"/usr/local/lib/libswmhack.so\"|\"libswmhack.so\"|' spectrwm.c - sed -i 's/verbose_layout = false;/verbose_layout = true;/' spectrwm.c - sed -i 's/# modkey = Mod1/modkey = Mod4/' spectrwm.conf - # crashes if defaults can't be found, use less massive defaults - sed -i 's/-\*-terminus-medium-\*-\*-\*-\*/-*-profont-*-*-*-*-12/' spectrwm.conf - #sed -i 's/# program[lock].*/program[lock] = slock/' spectrwm.conf - - # see spectrwm FS#403 - sed -i 's/setconfspawn("lock".*/setconfspawn("lock", "xlock", SWM_SPAWN_OPTIONAL);/' spectrwm.c - - cd linux - cp "$srcdir/$pkgname-2.5.1/linux/Makefile" ./ - make PREFIX="/usr" -} - -package() { - cd "$srcdir/$pkgname-$pkgver/linux" - make PREFIX="/usr" DESTDIR="$pkgdir" install - install -Dm644 spectrwm.desktop "$pkgdir/usr/share/xsessions/spectrwm.desktop" - cd .. - install -Dm644 spectrwm.conf "$pkgdir/etc/spectrwm.conf" - install -Dm755 screenshot.sh "$pkgdir/usr/share/spectrwm/screenshot.sh" - mkdir -p "$pkgdir/etc/spectrwm" - cp spectrwm_*.conf "$pkgdir/etc/spectrwm/" - cd "$srcdir" - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - install -Dm755 baraction.sh "$pkgdir/usr/share/spectrwm/baraction.sh" - install -Dm755 spectrwm-no-preload "$pkgdir/usr/bin/spectrwm-no-preload" - - #ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so.0" - #ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so" - - # fix this for real in the makefile - rm "$pkgdir/usr/bin/scrotwm" - ln -s "/usr/bin/spectrwm" "$pkgdir/usr/bin/scrotwm" - mkdir -p "$pkgdir"/usr/share/man/{es,it,pt,ru}/man1/ - mv "$pkgdir/usr/share/man/man1/spectrwm_es.1" "$pkgdir/usr/share/man/es/man1/" - mv "$pkgdir/usr/share/man/man1/spectrwm_it.1" "$pkgdir/usr/share/man/it/man1/" - mv "$pkgdir/usr/share/man/man1/spectrwm_pt.1" "$pkgdir/usr/share/man/pt/man1/" - mv "$pkgdir/usr/share/man/man1/spectrwm_ru.1" "$pkgdir/usr/share/man/ru/man1/" -} Copied: spectrwm/repos/community-x86_64/PKGBUILD (from rev 133981, spectrwm/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2015-05-22 20:38:12 UTC (rev 133982) @@ -0,0 +1,67 @@ +# $Id$ +# Maintainer: Kyle Keen <keen...@gmail.com> +# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> + +pkgname=spectrwm +pkgver=2.7.0 +pkgrel=1 +pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way." +arch=('i686' 'x86_64') +url="http://www.spectrwm.org" +_watch="https://opensource.conformal.com/snapshots/spectrwm/" +license=('custom:ISC') +depends=('dmenu' 'xcb-util' 'xcb-util-wm' 'xcb-util-keysyms' 'libxrandr' 'libxft' 'libxcursor' 'profont') +replaces=('scrotwm') +makedepends=('libxt') +optdepends=('scrot: screenshots' + 'xlockmore: great screenlocker' + 'terminus-font: great font') +backup=(etc/spectrwm.conf) + +source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz \ + LICENSE \ + baraction.sh \ + spectrwm-no-preload) +md5sums=('a638207b5e20ad1bfaf0a8ae61a69eef' + 'a67cfe51079481e5b0eab1ad371379e3' + '950d663692e1da56e0ac864c6c3ed80e' + '974d109ce0af39cc73936d5efd682480') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + sed -i 's|\"/usr/local/lib/libswmhack.so\"|\"libswmhack.so\"|' spectrwm.c + sed -i 's/verbose_layout = false;/verbose_layout = true;/' spectrwm.c + sed -i 's/# modkey = Mod1/modkey = Mod4/' spectrwm.conf + # crashes if defaults can't be found, use less massive defaults + sed -i 's/-\*-terminus-medium-\*-\*-\*-\*/-*-profont-*-*-*-*-12/' spectrwm.conf + #sed -i 's/# program[lock].*/program[lock] = slock/' spectrwm.conf + + # see spectrwm FS#403 + sed -i 's/setconfspawn("lock".*/setconfspawn("lock", "xlock", SWM_SPAWN_OPTIONAL);/' spectrwm.c + + cd linux + make PREFIX="/usr" +} + +package() { + cd "$srcdir/$pkgname-$pkgver/linux" + make PREFIX="/usr" DESTDIR="$pkgdir" install + install -Dm644 spectrwm.desktop "$pkgdir/usr/share/xsessions/spectrwm.desktop" + cd .. + install -Dm644 spectrwm.conf "$pkgdir/etc/spectrwm.conf" + install -Dm755 screenshot.sh "$pkgdir/usr/share/spectrwm/screenshot.sh" + mkdir -p "$pkgdir/etc/spectrwm" + cp spectrwm_*.conf "$pkgdir/etc/spectrwm/" + cd "$srcdir" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm755 baraction.sh "$pkgdir/usr/share/spectrwm/baraction.sh" + install -Dm755 spectrwm-no-preload "$pkgdir/usr/bin/spectrwm-no-preload" + + #ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so.0" + #ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so" + + # fix this for real in the makefile + rm "$pkgdir/usr/bin/scrotwm" + ln -s "/usr/bin/spectrwm" "$pkgdir/usr/bin/scrotwm" +} Deleted: community-x86_64/baraction.sh =================================================================== --- community-x86_64/baraction.sh 2015-05-22 20:37:45 UTC (rev 133981) +++ community-x86_64/baraction.sh 2015-05-22 20:38:12 UTC (rev 133982) @@ -1,82 +0,0 @@ -#!/bin/bash -# baraction.sh for spectrwm status bar -# From http://wiki.archlinux.org/index.php/Scrotwm - -SLEEP_SEC=5 -#loops forever outputting a line every SLEEP_SEC secs -while :; do - - eval $(cat /proc/acpi/battery/BAT0/state | awk '/charging state/ {printf "BAT_CHGSTATE=%s;", $3}; /remaining capacity/ {printf "BAT_REMNG=%s;",$3}; /present rate/ {printf "BAT_RATE=%s;",$3};' -) - eval $(cat /proc/acpi/battery/BAT0/info | awk '/present/ {printf "BAT_PRESENT=%s;", $2}; /last full capacity/ {printf "BAT_LASTFULL=%s;",$4};' -) - - BAT_REMNG_WH=`echo "scale=1; a=($BAT_REMNG+50)/1000; print a" | bc -l` - BAT_RATE_W=`echo "scale=1; a=($BAT_RATE+50)/1000; print a" | bc -l` - BCSCRIPT="scale=0; a=(100*$BAT_REMNG / $BAT_LASTFULL); print a" - BAT_PCT=`echo $BCSCRIPT | bc -l`% - - case $BAT_PRESENT in - no) - POWER_STR="AC, NO BATTERY" - ;; - yes) - - case $BAT_CHGSTATE in - charged) - #on ac - AC_STATUS="ON AC" - TIME_REMNG="N/A" - POWER_STR="$AC_STATUS $BAT_CHGSTATE $BAT_PCT" - ;; - charging) - #on ac - AC_STATUS="ON AC" - BCSCRIPT="scale=1; a=(60*($BAT_LASTFULL - $BAT_REMNG) / $BAT_RATE); print a" - TIMETOFULL_MIN=`echo $BCSCRIPT | bc -l` - POWER_STR="$AC_STATUS $BAT_CHGSTATE $BAT_PCT C="$BAT_REMNG_WH"Wh Rate="$BAT_RATE_W"W TTF="$TIMETOFULL_MIN"min" - ;; - discharging) - AC_STATUS="ON BATT" - TIME_REMNG_MIN=`echo "scale=0; a=(60*$BAT_REMNG / $BAT_RATE); print a" | bc -l` - TIME_REMNG_HH=`echo "scale=0; a=($BAT_REMNG / $BAT_RATE); if (a<10) {print "0"; print a} else {print a}" | bc -l` - - TIME_REMNG_MM=`echo "scale=0; a=($TIME_REMNG_MIN-60*$TIME_REMNG_HH); if (a<10) {print "0"; print a} else {print a}" | bc -l` - POWER_STR="$AC_STATUS $BAT_PCT C="$BAT_REMNG_WH"Wh P="$BAT_RATE_W"W R="$TIME_REMNG_HH":"$TIME_REMNG_MM - ;; - *) - POWER_STR=$BAT_CHGSTATE - ;; - esac - - ;; - *) - POWER_STR="error" - ;; - esac - - #spectrwm bar_print can't handle UTF-8 characters, such as degree symbol - #Core 0: +67.0°C (crit = +100.0°C) - eval $(sensors 2>/dev/null | sed s/[°+]//g | awk '/^Core 0/ {printf "CORE0TEMP=%s;", $3}; /^Core 1/ {printf "CORE1TEMP=%s;",$3}; /^fan1/ {printf "FANSPD=%s;",$2};' -) - TEMP_STR="Tcpu=$CORE0TEMP,$CORE1TEMP F=$FANSPD" - - WLAN_ESSID=$(iwconfig wlan0 | awk -F "\"" '/wlan0/ { print $2 }') - eval $(cat /proc/net/wireless | sed s/[.]//g | awk '/wlan0/ {printf "WLAN_QULTY=%s; WLAN_SIGNL=%s; WLAN_NOISE=%s", $3,$4,$5};' -) - BCSCRIPT="scale=0;a=100*$WLAN_QULTY/70;print a" - WLAN_QPCT=`echo $BCSCRIPT | bc -l` - WLAN_POWER=`iwconfig 2>/dev/null| grep "Tx-Power"| awk {'print $4'}|sed s/Tx-Power=//` - WLAN_STR="$WLAN_ESSID: Q=$WLAN_QPCT% S/N="$WLAN_SIGNL"/"$WLAN_NOISE"dBm T="$WLAN_POWER"dBm" - - CPUFREQ_STR=`echo "Freq:"$(cat /proc/cpuinfo | grep 'cpu MHz' | sed 's/.*: //g; s/\..*//g;')` - CPULOAD_STR="Load:$(uptime | sed 's/.*://; s/,//g')" - - eval $(awk '/^MemTotal/ {printf "MTOT=%s;", $2}; /^MemFree/ {printf "MFREE=%s;",$2}' /proc/meminfo) - MUSED=$(( $MTOT - $MFREE )) - MUSEDPT=$(( ($MUSED * 100) / $MTOT )) - MEM_STR="Mem:${MUSEDPT}%" - - echo -e "$POWER_STR $TEMP_STR $CPUFREQ_STR $CPULOAD_STR $MEM_STR $WLAN_STR" - #alternatively if you prefer a different date format - #DATE_STR=`date +"%H:%M %a %d %b` - #echo -e "$DATE_STR $POWER_STR $TEMP_STR $CPUFREQ_STR $CPULOAD_STR $MEM_STR $WLAN_STR" - - sleep $SLEEP_SEC -done Copied: spectrwm/repos/community-x86_64/baraction.sh (from rev 133981, spectrwm/trunk/baraction.sh) =================================================================== --- community-x86_64/baraction.sh (rev 0) +++ community-x86_64/baraction.sh 2015-05-22 20:38:12 UTC (rev 133982) @@ -0,0 +1,82 @@ +#!/bin/bash +# baraction.sh for spectrwm status bar +# From http://wiki.archlinux.org/index.php/Scrotwm + +SLEEP_SEC=5 +#loops forever outputting a line every SLEEP_SEC secs +while :; do + + eval $(cat /proc/acpi/battery/BAT0/state | awk '/charging state/ {printf "BAT_CHGSTATE=%s;", $3}; /remaining capacity/ {printf "BAT_REMNG=%s;",$3}; /present rate/ {printf "BAT_RATE=%s;",$3};' -) + eval $(cat /proc/acpi/battery/BAT0/info | awk '/present/ {printf "BAT_PRESENT=%s;", $2}; /last full capacity/ {printf "BAT_LASTFULL=%s;",$4};' -) + + BAT_REMNG_WH=`echo "scale=1; a=($BAT_REMNG+50)/1000; print a" | bc -l` + BAT_RATE_W=`echo "scale=1; a=($BAT_RATE+50)/1000; print a" | bc -l` + BCSCRIPT="scale=0; a=(100*$BAT_REMNG / $BAT_LASTFULL); print a" + BAT_PCT=`echo $BCSCRIPT | bc -l`% + + case $BAT_PRESENT in + no) + POWER_STR="AC, NO BATTERY" + ;; + yes) + + case $BAT_CHGSTATE in + charged) + #on ac + AC_STATUS="ON AC" + TIME_REMNG="N/A" + POWER_STR="$AC_STATUS $BAT_CHGSTATE $BAT_PCT" + ;; + charging) + #on ac + AC_STATUS="ON AC" + BCSCRIPT="scale=1; a=(60*($BAT_LASTFULL - $BAT_REMNG) / $BAT_RATE); print a" + TIMETOFULL_MIN=`echo $BCSCRIPT | bc -l` + POWER_STR="$AC_STATUS $BAT_CHGSTATE $BAT_PCT C="$BAT_REMNG_WH"Wh Rate="$BAT_RATE_W"W TTF="$TIMETOFULL_MIN"min" + ;; + discharging) + AC_STATUS="ON BATT" + TIME_REMNG_MIN=`echo "scale=0; a=(60*$BAT_REMNG / $BAT_RATE); print a" | bc -l` + TIME_REMNG_HH=`echo "scale=0; a=($BAT_REMNG / $BAT_RATE); if (a<10) {print "0"; print a} else {print a}" | bc -l` + + TIME_REMNG_MM=`echo "scale=0; a=($TIME_REMNG_MIN-60*$TIME_REMNG_HH); if (a<10) {print "0"; print a} else {print a}" | bc -l` + POWER_STR="$AC_STATUS $BAT_PCT C="$BAT_REMNG_WH"Wh P="$BAT_RATE_W"W R="$TIME_REMNG_HH":"$TIME_REMNG_MM + ;; + *) + POWER_STR=$BAT_CHGSTATE + ;; + esac + + ;; + *) + POWER_STR="error" + ;; + esac + + #spectrwm bar_print can't handle UTF-8 characters, such as degree symbol + #Core 0: +67.0°C (crit = +100.0°C) + eval $(sensors 2>/dev/null | sed s/[°+]//g | awk '/^Core 0/ {printf "CORE0TEMP=%s;", $3}; /^Core 1/ {printf "CORE1TEMP=%s;",$3}; /^fan1/ {printf "FANSPD=%s;",$2};' -) + TEMP_STR="Tcpu=$CORE0TEMP,$CORE1TEMP F=$FANSPD" + + WLAN_ESSID=$(iwconfig wlan0 | awk -F "\"" '/wlan0/ { print $2 }') + eval $(cat /proc/net/wireless | sed s/[.]//g | awk '/wlan0/ {printf "WLAN_QULTY=%s; WLAN_SIGNL=%s; WLAN_NOISE=%s", $3,$4,$5};' -) + BCSCRIPT="scale=0;a=100*$WLAN_QULTY/70;print a" + WLAN_QPCT=`echo $BCSCRIPT | bc -l` + WLAN_POWER=`iwconfig 2>/dev/null| grep "Tx-Power"| awk {'print $4'}|sed s/Tx-Power=//` + WLAN_STR="$WLAN_ESSID: Q=$WLAN_QPCT% S/N="$WLAN_SIGNL"/"$WLAN_NOISE"dBm T="$WLAN_POWER"dBm" + + CPUFREQ_STR=`echo "Freq:"$(cat /proc/cpuinfo | grep 'cpu MHz' | sed 's/.*: //g; s/\..*//g;')` + CPULOAD_STR="Load:$(uptime | sed 's/.*://; s/,//g')" + + eval $(awk '/^MemTotal/ {printf "MTOT=%s;", $2}; /^MemFree/ {printf "MFREE=%s;",$2}' /proc/meminfo) + MUSED=$(( $MTOT - $MFREE )) + MUSEDPT=$(( ($MUSED * 100) / $MTOT )) + MEM_STR="Mem:${MUSEDPT}%" + + echo -e "$POWER_STR $TEMP_STR $CPUFREQ_STR $CPULOAD_STR $MEM_STR $WLAN_STR" + #alternatively if you prefer a different date format + #DATE_STR=`date +"%H:%M %a %d %b` + #echo -e "$DATE_STR $POWER_STR $TEMP_STR $CPUFREQ_STR $CPULOAD_STR $MEM_STR $WLAN_STR" + + sleep $SLEEP_SEC +done Deleted: community-x86_64/spectrwm-no-preload =================================================================== --- community-x86_64/spectrwm-no-preload 2015-05-22 20:37:45 UTC (rev 133981) +++ community-x86_64/spectrwm-no-preload 2015-05-22 20:38:12 UTC (rev 133982) @@ -1,2 +0,0 @@ -#!/bin/sh -exec env -u LD_PRELOAD $@ Copied: spectrwm/repos/community-x86_64/spectrwm-no-preload (from rev 133981, spectrwm/trunk/spectrwm-no-preload) =================================================================== --- community-x86_64/spectrwm-no-preload (rev 0) +++ community-x86_64/spectrwm-no-preload 2015-05-22 20:38:12 UTC (rev 133982) @@ -0,0 +1,2 @@ +#!/bin/sh +exec env -u LD_PRELOAD $@