projects
/
grml-etc-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support /etc/grml/screenrc in screen function for non-root users.
[grml-etc-core.git]
/
etc
/
zsh
/
zshrc
diff --git
a/etc/zsh/zshrc
b/etc/zsh/zshrc
index
04645d7
..
cd1a220
100644
(file)
--- a/
etc/zsh/zshrc
+++ b/
etc/zsh/zshrc
@@
-2149,7
+2149,11
@@
if check_com -c screen ; then
elif [[ -r $HOME/.screenrc ]] ; then
alias screen="${commands[screen]} -c $HOME/.screenrc"
else
elif [[ -r $HOME/.screenrc ]] ; then
alias screen="${commands[screen]} -c $HOME/.screenrc"
else
- [[ -r /etc/grml/screenrc_grml ]] && alias screen="${commands[screen]} -c /etc/grml/screenrc_grml"
+ if [[ -r /etc/grml/screenrc_grml ]]; then
+ alias screen="${commands[screen]} -c /etc/grml/screenrc_grml"
+ else
+ [[ -r /etc/grml/screenrc ]] && alias screen="${commands[screen]} -c /etc/grml/screenrc"
+ fi
fi
fi
fi
fi
@@
-3496,16
+3500,16
@@
regcheck() {
pcre_match $2 && echo "regex matches" || echo "regex does not match"
}
pcre_match $2 && echo "regex matches" || echo "regex does not match"
}
-#f5# List files which have been changed within the last {\it n} days
+#f5# List files which have been changed within the last {\it n} days
, {\it n} defaults to 1
changed() {
emulate -L zsh
changed() {
emulate -L zsh
- print -l *(c-$
1
)
+ print -l *(c-$
{1:1}
)
}
}
-#f5# List files which have been modified within the last {\it n} days
+#f5# List files which have been modified within the last {\it n} days
, {\it n} defaults to 1
new() {
emulate -L zsh
new() {
emulate -L zsh
- print -l *(m-$
1
)
+ print -l *(m-$
{1:1}
)
}
#f5# Grep in history
}
#f5# Grep in history