From 74c3a53c314d2eee6cf0aca62887aa4781d582dd Mon Sep 17 00:00:00 2001 From: Frank Villaro-Dixon Date: Wed, 26 Jun 2013 01:22:52 +0200 Subject: [PATCH] octopus (battery time), dwm (terminal) and install.sh --- Utils/octopus.sh | 6 ++++-- dwm/config.h | 2 +- install.sh | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Utils/octopus.sh b/Utils/octopus.sh index efeb534..fceb046 100755 --- a/Utils/octopus.sh +++ b/Utils/octopus.sh @@ -50,11 +50,13 @@ case $1 in "refresh") DATE=`date +"%A %d, %H:%M:%S - %s"` - BATT=$( acpi -b | sed 's/.*[charg.|], \([0-9]*\)%.*/\1/gi' ) + BATT_PCT=$(acpi -b | cut -d, -f2 | cut -d" " -f2) + BATT_TIME=$(acpi -b | cut -d, -f3 | cut -d" " -f2) + #BATT=$( acpi -b | sed 's/.*[charg.|], \([0-9]*\)%.*/\1/gi' ) VOLUME=`amixer get Master | tail -n 2 | head -n 1 | cut -d' ' -f7` MEM=`awk '/MemTotal/ {printf( "%.0fMb", $2 / 1024 )}' /proc/meminfo` - xsetroot -name "$VOLUME :: $MEM :: $BATT :: $DATE" + xsetroot -name "$VOLUME :: $MEM :: $BATT_PCT $BATT_TIME :: $DATE" ;; "wallpaper") diff --git a/dwm/config.h b/dwm/config.h index 8136b6c..33482da 100644 --- a/dwm/config.h +++ b/dwm/config.h @@ -53,7 +53,7 @@ static const Layout layouts[] = { /* commands */ static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL }; -static const char *termcmd[] = { "gnome-terminal", NULL }; +static const char *termcmd[] = { "roxterm", NULL }; static const char *webcmd[] = { "firefox", NULL }; static const char *mailcmd[] = { "thunderbird", NULL }; diff --git a/install.sh b/install.sh index f790ce9..d932349 100755 --- a/install.sh +++ b/install.sh @@ -34,7 +34,7 @@ cd skeletons for i in `ls $WAI/vim/skeletons`; do ln -s $WAI/vim/skeletons/$i ./$i; done cd ~ -if [ -d "Programmation"]; then mkdir Programmation; fi; +if [ -d "Programmation" ]; then mkdir Programmation; fi; cd ~/Programmation if [ ! -d "./Utils" ]; then mkdir Utils; fi; cd ./Utils