projects
/
grml-etc-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
zshrc: began rewriting bk()
[grml-etc-core.git]
/
etc
/
zsh
/
zshrc
diff --git
a/etc/zsh/zshrc
b/etc/zsh/zshrc
index
a164fb8
..
8357683
100644
(file)
--- a/
etc/zsh/zshrc
+++ b/
etc/zsh/zshrc
@@
-1697,10
+1697,10
@@
fi
batteryopenbsd(){
GRML_BATTERY_LEVEL=''
batteryopenbsd(){
GRML_BATTERY_LEVEL=''
-local batfull batwarn batnow num
+local bat
bat
full batwarn batnow num
for num in 0 1 ; do
bat=$(sysctl -n hw.sensors.acpibat${num})
for num in 0 1 ; do
bat=$(sysctl -n hw.sensors.acpibat${num})
- if [[
! -z
$bat ]]; then
+ if [[
-n
$bat ]]; then
batfull=${"$(sysctl -n hw.sensors.acpibat${num}.amphour0)"%% *}
batwarn=${"$(sysctl -n hw.sensors.acpibat${num}.amphour1)"%% *}
batnow=${"$(sysctl -n hw.sensors.acpibat${num}.amphour3)"%% *}
batfull=${"$(sysctl -n hw.sensors.acpibat${num}.amphour0)"%% *}
batwarn=${"$(sysctl -n hw.sensors.acpibat${num}.amphour1)"%% *}
batnow=${"$(sysctl -n hw.sensors.acpibat${num}.amphour3)"%% *}
@@
-1729,8
+1729,8
@@
GRML_BATTERY_LEVEL=''
local num
local -A table
for num in 0 1 ; do
local num
local -A table
for num in 0 1 ; do
- table=( ${=${${${${${(M)${(f)"$(acpiconf -i $num)"}:#(State|Remaining capacity):*}%%( ##|%)}//:[ $'\t']##/@}// /-}//@/ }} )
- if [[ $table[State] != "not-present" ]] ; then
+ table=( ${=${${${${${(M)${(f)"$(acpiconf -i $num
2>&1
)"}:#(State|Remaining capacity):*}%%( ##|%)}//:[ $'\t']##/@}// /-}//@/ }} )
+ if [[
-n $table ]] && [[
$table[State] != "not-present" ]] ; then
case $table[State] in
*discharging*)
if (( $table[Remaining-capacity] < 20 )) ; then
case $table[State] in
*discharging*)
if (( $table[Remaining-capacity] < 20 )) ; then
@@
-2411,8
+2411,6
@@
hash -d linux=/lib/modules/$(command uname -r)/build/
hash -d log=/var/log
hash -d slog=/var/log/syslog
hash -d src=/usr/src
hash -d log=/var/log
hash -d slog=/var/log/syslog
hash -d src=/usr/src
-hash -d templ=/usr/share/doc/grml-templates
-hash -d tt=/usr/share/doc/texttools-doc
hash -d www=/var/www
#d# end
hash -d www=/var/www
#d# end
@@
-3021,10
+3019,16
@@
fi
# useful functions
# useful functions
-#f5# Backup \kbd{file
{\rm to} file
\_timestamp}
+#f5# Backup \kbd{file
_or_folder {\rm to} file_or_folder
\_timestamp}
bk() {
emulate -L zsh
bk() {
emulate -L zsh
- cp -b $1 $1_`date --iso-8601=m`
+ if islinux; then
+ cp -a "$1" "$1_$(date --iso-8601=m)"
+ elif isopenbsd; then
+ cp -R "$1" "$1_$(date "+%FT%H:%M")"
+ else;
+ echo 'sorry, not yet implemented, send a patch!' >&2
+ fi
}
#f5# cd to directoy and list files
}
#f5# cd to directoy and list files