timeout not as alias but fct

diff --git a/etc/aliases b/etc/aliases
index dbede2dce2ffe0ee3bc508300cefe5cc27f2af4b..195014921f14b9c52f3e63d192ffe73b81d455d9 100644 (file)
--- a/etc/aliases
+++ b/etc/aliases
@@ -17,8 +17,6 @@ alias nmap-ping="nmap -sP -PE -PS443 -PA21,22,23,80,3389"
 alias arp-list="arp -an"
 alias pdf2jpegs='gs -dNOPAUSE -sDEVICE=jpeg -dFirstPage=1 -dLastPage=5 -sOutputFile=pdf2jpegs%d.jpg -dJPEGQ=100 -r500 -c quit'
 alias nb-maildir-make="maildirmake -S Maildir; for d in Spam Trash Sent;do maildirmake -f $d Maildir; done"
-which timeout 1>/dev/null || alias timeout="perl -e 'alarm(shift @ARGV); exec @ARGV' --"
-
 
 #[ "$UID" = "0" ] && grep -q '^_\?postgres:' /etc/passwd && alias psql='sudo -u postgres psql'
 

diff --git a/etc/bashrc.function b/etc/bashrc.function
index ae4b4967523d1a1c385005d15181d8fae6888ff8..02b49860872f1e5795d23bbd9c7fe1a82c10fe40 100644 (file)
--- a/etc/bashrc.function
+++ b/etc/bashrc.function
@@ -3,6 +3,12 @@
 # FUNCTIONS - SH
 #
 #################################################################################
+if ! which timeout 1>/dev/null; then
+timeout() {
+  perl -e 'alarm(shift @ARGV); exec @ARGV' -- $@
+}
+fi
+
 shell_help() {
   #
   # Print help message and return true if args contains -?-h(elp)?