From 0b230c6d98a1781ee05580c282ca8b227878885b Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <hugues@hiegel.fr>
Date: Thu, 29 Jan 2009 13:10:51 +0100
Subject: [PROMPT] ibam is more reactive than /proc/pmu to get battery times

---
 12_Prompts.zsh | 49 +++++++++++++++++++------------------------------
 1 file changed, 19 insertions(+), 30 deletions(-)

diff --git a/12_Prompts.zsh b/12_Prompts.zsh
index a8c9043..8b7c259 100644
--- a/12_Prompts.zsh
+++ b/12_Prompts.zsh
@@ -99,50 +99,39 @@ update_prompt()
 	[ "$DEBUG" = "yes" ] && echo
 
 	
-	if [ -e /proc/pmu/battery_0 ]
+	if ( cmd_exists ibam && [ -e /proc/pmu/battery_0 ] )
 	then
 		[ "$DEBUG" = "yes" ] && echo -n "	Battery..."
 		## Time
-		BATTERY_TIME=$(grep "^time rem" /proc/pmu/battery_0 | cut -c14- )
-		BATTERY=$(( $BATTERY_TIME / 3600 ))
-		BATTERY=$BATTERY"h"$(( ($BATTERY_TIME - ( $BATTERY * 3600 )) / 60 ))"m"
-		BATTERYTMP="-"$BATTERY
+
+		POWERADAPTER=$(grep "^AC Power" /proc/pmu/info | cut -c26)
+		BATTERYTIME=$(ibam -r | head -n1 | cut -c30- | cut -d: -f1,2 | tr ':' 'h')
+
+		BATTERYTMP="-"$BATTERYTIME
 		BATTERYSIZE=${#BATTERYTMP}
+		BATTERYTIMEMIN=$(( $(echo $BATTERYTIME | cut -dh -f1) * 60 + $(echo $BATTERYTIME | cut -dh -f2) ))
 
-		BATTERYCHARGING=$(grep "^current" /proc/pmu/battery_0 | cut -c14- )
-		if [ $BATTERYCHARGING -gt 0 ]
+		if [ $POWERADAPTER -eq 1 -a $BATTERYTIME != "0:00" ]
 		then
-			BATTERY="$C_$battery_colors[charging]$_C"$BATTERY
-			BATTERY="$C_$prompt_colors[bar]$_C"-"$BATTERY"
+			BATTERYCOLOR="charging"
 		else
-			if [ $BATTERYCHARGING -lt 0 ]
+			if [ $POWERADAPTER -eq 0 ]
 			then
-				if [ $BATTERY_TIME -lt 659 ]
+				if [ $BATTERYTIMEMIN -le 10 ]
 				then
-					BATTERY="$C_$battery_colors[critical]$_C"$BATTERY
+					BATTERYCOLOR="critical"
 				else
-					BATTERY="$C_$battery_colors[uncharging]$_C"$BATTERY
+					BATTERYCOLOR="uncharging"
 				fi
-				BATTERY="$C_$prompt_colors[bar]$_C"-"$BATTERY"
 			else
-				## Battery full
-				BATTERY=$(grep "^AC Power" /proc/pmu/info | cut -c26)
-				if [ $BATTERY -ne 0 ]
-				then
-					BATTERY="⚡"
-					BATTERY="$C_$prompt_colors[bar]$_C"-"$BATTERY"
-					BATTERYSIZE=2
-				else
-					BATTERY=""
-					BATTERYSIZE=0
-				fi
+				BATTERYTIME="⚡"
+				BATTERYSIZE=2
+				BATTERYCOLOR=charging
 			fi
 		fi
-		## Percentage
-		#BATTERY=$(( $(grep "^charge" /proc/pmu/battery_0 | cut -c14- ) * 100 / $(grep "^max_charge" /proc/pmu/battery_0 |cut -c14-) ))
-		#BATTERY="-$BATTERY%"
-		#BATTERYSIZE=${#BATTERY}
-		#BATTERY="$C_$prompt_colors[bar]$_C""$BATTERY%"
+
+		BATTERY="$C_$prompt_colors[bar]$_C"-"$C_$battery_colors[$BATTERYCOLOR]$_C$BATTERYTIME"
+
 		[ "$DEBUG" = "yes" ] && echo
 	else
 		BATTERY=
-- 
cgit v1.2.3


From c4e84ff816fc481104620985b608357dcc723b3f Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <hugues@hiegel.fr>
Date: Thu, 29 Jan 2009 16:17:07 +0100
Subject: [KEYCHAIN] startup script

---
 10_Environment.zsh | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/10_Environment.zsh b/10_Environment.zsh
index 378dff7..303cd55 100644
--- a/10_Environment.zsh
+++ b/10_Environment.zsh
@@ -21,10 +21,20 @@ export SHELL=`which zsh`
 ## Agent de clefs SSH/GPG
 if [ "$SUDO_USER" = "" ]
 then
-	KEYCHAIN=~/.keychain/$(hostname)-sh
-	cmd_exists keychain && keychain --quiet
-	[ -f ${KEYCHAIN}     ] && source ${KEYCHAIN}
-	[ -f ${KEYCHAIN}-gpg ] && source ${KEYCHAIN}-gpg
+	if cmd_exists keychain
+	then
+		if [ -f ~/.keychain/startup.zsh ]
+		then
+			~/.keychain/startup.zsh --quiet
+		else
+			KEYCHAIN=~/.keychain/$(hostname)-sh
+			[ -f ${KEYCHAIN}     ] && source ${KEYCHAIN}
+			[ -f ${KEYCHAIN}-gpg ] && source ${KEYCHAIN}-gpg
+			cmd_exists keychain && keychain --quiet --quick --inherit any --stop others
+			[ -f ${KEYCHAIN}     ] && source ${KEYCHAIN}
+			[ -f ${KEYCHAIN}-gpg ] && source ${KEYCHAIN}-gpg
+		fi
+	fi
 fi
 
 ## Colors 
-- 
cgit v1.2.3


From 7baa4f132c9ed864de28c68cf5c4fdfabf4121a1 Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <hugues@hiegel.fr>
Date: Thu, 29 Jan 2009 16:20:06 +0100
Subject: [PROMPT] battery charge complete workaround for ibam

---
 12_Prompts.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/12_Prompts.zsh b/12_Prompts.zsh
index 8b7c259..053210c 100644
--- a/12_Prompts.zsh
+++ b/12_Prompts.zsh
@@ -105,13 +105,14 @@ update_prompt()
 		## Time
 
 		POWERADAPTER=$(grep "^AC Power" /proc/pmu/info | cut -c26)
+		ISCHARGING=$(grep "^current" /proc/pmu/battery_0 | cut -c14)
 		BATTERYTIME=$(ibam -r | head -n1 | cut -c30- | cut -d: -f1,2 | tr ':' 'h')
 
 		BATTERYTMP="-"$BATTERYTIME
 		BATTERYSIZE=${#BATTERYTMP}
 		BATTERYTIMEMIN=$(( $(echo $BATTERYTIME | cut -dh -f1) * 60 + $(echo $BATTERYTIME | cut -dh -f2) ))
 
-		if [ $POWERADAPTER -eq 1 -a $BATTERYTIME != "0:00" ]
+		if [ $POWERADAPTER -eq 1 -a $ISCHARGING -ne 0 ]
 		then
 			BATTERYCOLOR="charging"
 		else
-- 
cgit v1.2.3


From 833c82db513a66ad3483195b4a801524d14b9b33 Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <hugues@hiegel.fr>
Date: Thu, 29 Jan 2009 16:43:50 +0100
Subject: [PROMPT] get back to /proc/pmu instead of ibam. It's much better.
 really. Revert "[PROMPT] ibam is more reactive than /proc/pmu to get battery
 times"

---
 12_Prompts.zsh | 44 +++++++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/12_Prompts.zsh b/12_Prompts.zsh
index 053210c..d8c8730 100644
--- a/12_Prompts.zsh
+++ b/12_Prompts.zsh
@@ -99,40 +99,46 @@ update_prompt()
 	[ "$DEBUG" = "yes" ] && echo
 
 	
-	if ( cmd_exists ibam && [ -e /proc/pmu/battery_0 ] )
+	if [ -e /proc/pmu/battery_0 ]
 	then
 		[ "$DEBUG" = "yes" ] && echo -n "	Battery..."
 		## Time
-
-		POWERADAPTER=$(grep "^AC Power" /proc/pmu/info | cut -c26)
-		ISCHARGING=$(grep "^current" /proc/pmu/battery_0 | cut -c14)
-		BATTERYTIME=$(ibam -r | head -n1 | cut -c30- | cut -d: -f1,2 | tr ':' 'h')
-
-		BATTERYTMP="-"$BATTERYTIME
+		BATTERY_TIME=$(grep "^time rem" /proc/pmu/battery_0 | cut -c14- )
+		BATTERY=$(( $BATTERY_TIME / 3600 ))
+		BATTERY=$BATTERY"h"$(( ($BATTERY_TIME - ( $BATTERY * 3600 )) / 60 ))"m"
+		BATTERYTMP="-"$BATTERY
 		BATTERYSIZE=${#BATTERYTMP}
-		BATTERYTIMEMIN=$(( $(echo $BATTERYTIME | cut -dh -f1) * 60 + $(echo $BATTERYTIME | cut -dh -f2) ))
 
-		if [ $POWERADAPTER -eq 1 -a $ISCHARGING -ne 0 ]
+		BATTERYCHARGING=$(grep "^current" /proc/pmu/battery_0 | cut -c14- )
+		if [ $BATTERYCHARGING -gt 0 ]
 		then
-			BATTERYCOLOR="charging"
+			BATTERY="$C_$battery_colors[charging]$_C"$BATTERY
+			BATTERY="$C_$prompt_colors[bar]$_C"-"$BATTERY"
 		else
-			if [ $POWERADAPTER -eq 0 ]
+			if [ $BATTERYCHARGING -lt 0 ]
 			then
-				if [ $BATTERYTIMEMIN -le 10 ]
+				if [ $BATTERY_TIME -lt 659 ]
 				then
-					BATTERYCOLOR="critical"
+					BATTERY="$C_$battery_colors[critical]$_C"$BATTERY
 				else
-					BATTERYCOLOR="uncharging"
+					BATTERY="$C_$battery_colors[uncharging]$_C"$BATTERY
 				fi
+				BATTERY="$C_$prompt_colors[bar]$_C"-"$BATTERY"
 			else
-				BATTERYTIME="⚡"
-				BATTERYSIZE=2
-				BATTERYCOLOR=charging
+				## Battery full
+				BATTERY=$(grep "^AC Power" /proc/pmu/info | cut -c26)
+				if [ $BATTERY -ne 0 ]
+				then
+					BATTERY="⚡"
+					BATTERY="$C_$prompt_colors[bar]$_C"-"$BATTERY"
+					BATTERYSIZE=2
+				else
+					BATTERY=""
+					BATTERYSIZE=0
+				fi
 			fi
 		fi
 
-		BATTERY="$C_$prompt_colors[bar]$_C"-"$C_$battery_colors[$BATTERYCOLOR]$_C$BATTERYTIME"
-
 		[ "$DEBUG" = "yes" ] && echo
 	else
 		BATTERY=
-- 
cgit v1.2.3


From f2d5d2805b68a99b9df6670e3585927ea9320257 Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <hugues@hiegel.fr>
Date: Fri, 30 Jan 2009 10:46:29 +0100
Subject: [KEYCHAIN] source file instead of executing it..

---
 10_Environment.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/10_Environment.zsh b/10_Environment.zsh
index 303cd55..9e5a1f9 100644
--- a/10_Environment.zsh
+++ b/10_Environment.zsh
@@ -25,7 +25,7 @@ then
 	then
 		if [ -f ~/.keychain/startup.zsh ]
 		then
-			~/.keychain/startup.zsh --quiet
+			source ~/.keychain/startup.zsh --quiet
 		else
 			KEYCHAIN=~/.keychain/$(hostname)-sh
 			[ -f ${KEYCHAIN}     ] && source ${KEYCHAIN}
-- 
cgit v1.2.3