Unset PHO_NOTE_x variables when possible.

[scripts.git] / bashrc

diff --git a/bashrc b/bashrc
index 3e6cc3a..f3d033a 100644 (file)
--- 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)
@@ -292,15 +292,20 @@ function map () {
 ## variables
 
 function pho () {
-    PHO_BIN=$(which pho)
     TEMP=$(mktemp /tmp/pho.XXXXXXX)
-    ${PHO_BIN} "$@" | tee ${TEMP}
+    $(which pho) "$@" | tee ${TEMP}
     PHO_NOTE_1=$(grep ^"Note 1: " ${TEMP} | sed -e "s/^[^:]*: //")
     PHO_NOTE_2=$(grep ^"Note 2: " ${TEMP} | sed -e "s/^[^:]*: //")
     PHO_NOTE_3=$(grep ^"Note 3: " ${TEMP} | sed -e "s/^[^:]*: //")
     PHO_NOTE_R90=$(grep ^"Rotate 90 \(CW\): " ${TEMP} | sed -e "s/^[^:]*: //")
     PHO_NOTE_R180=$(grep ^"Rotate 180: " ${TEMP} | sed -e "s/^[^:]*: //")
     PHO_NOTE_R270=$(grep ^"Rotate -90 \(CCW\): " ${TEMP} | sed -e "s/^[^:]*: //")
+    [[ "${PHO_NOTE_1}" ]] || unset PHO_NOTE_1
+    [[ "${PHO_NOTE_2}" ]] || unset PHO_NOTE_2
+    [[ "${PHO_NOTE_3}" ]] || unset PHO_NOTE_3
+    [[ "${PHO_NOTE_R90}" ]] || unset PHO_NOTE_R90
+    [[ "${PHO_NOTE_R180}" ]] || unset PHO_NOTE_R180
+    [[ "${PHO_NOTE_R270}" ]] || unset PHO_NOTE_R270
     \rm ${TEMP}
 }
 
@@ -339,19 +344,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 <interface>" >&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="$@"