From: Francois Fleuret Date: Fri, 6 Jan 2012 12:49:13 +0000 (+0100) Subject: Netup now requires explicitly an argument. X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=commitdiff_plain;h=57b8176460224fc44e6b83bdb305604063c8eed8;p=scripts.git Netup now requires explicitly an argument. --- diff --git a/bashrc b/bashrc index 3e6cc3a..d84d7c9 100644 --- a/bashrc +++ b/bashrc @@ -170,8 +170,8 @@ function ua () { case "$1" in - *.tgz|*.tar.gz) - tar zxvf "$1" + *.tgz|*.tar.gz|*.tbz|*.tar.bz2) + tar xvf "$1" ;; *.rar) @@ -339,19 +339,26 @@ function dt () { [[ ${NETUP_HISTORY} ]] || NETUP_HISTORY="${HOME}/.netup_history" function netup () { - if [[ $(ps auxwww | grep dhclient | grep -v grep) ]]; then + if [[ $(\ifconfig -s | grep -v ^"(Iface|lo) ") ]]; then + echo "There is already interface(s) up." >&2 + return 1 + fi + + if [[ $(\ps -C dhclient | tail -n +2) ]]; then echo "There is already a dhcp client running." >&2 return 1 fi - if [[ $(ps auxwww | grep wpa_supplicant | grep -v grep) ]]; then + if [[ $(\ps -C wpa_supplicant | tail -n +2) ]]; then echo "There is already a wpa_supplicant running." >&2 return 1 fi if [[ ! "$@" ]] && [[ -s ${NETUP_HISTORY} ]]; then - # If we have no argument and there is a .netup_history, use it - ARGS=$(cat ${NETUP_HISTORY}) + echo "netup " >&2 + return 1 + # # If we have no argument and there is a .netup_history, use it + # ARGS=$(cat ${NETUP_HISTORY}) else # Otherwise uses the given arguments, and store them ARGS="$@"