Ran shellcheck, fixed (?) things

10 files changed, 89 insertions, 70 deletions

diff --git a/aur b/aur
index 8e4c42f..fd1c5cb 100755
--- a/aur
+++ b/aur
@@ -9,29 +9,28 @@ fmt() { cut -d, -f 2,5,6 | sed 's/"Name":"//;s/","Version":"/ /;s/","Description
 if [ "$1" = "-s" ]; then
   shift
   echo Searching for "$*" ...
-  var="$(echo $* | sed 's/\ /%20/g')"
+  var="$(echo "$@" | sed 's/\ /%20/g')"
   wget -q "$url/rpc.php?type=search&arg=$var" -O - | sep | fmt
   exit
 fi;
   
-cd $dir
+cd "$dir" || return 127
 if [ -d "$1" ]; then
     echo Pulling ...
-    cd $1
+    cd "$1" || return 127
     git pull
 else
     echo Updating ...
     git clone "$url/$1.git"
-    cd $1
+    cd "$1" || return 127
 fi;
 
 echo -ne "Edit PKGBUILD? "
-read edit
+read -r edit
 [ "$edit" = "y" ] && $EDITOR PKGBUILD
 echo Building...
-makepkg -f
-if [ "$?" = "0" ]; then 
-    name=$1"-`sed -n 's/pkgver=//p' PKGBUILD`-`sed -n 's/pkgrel=//p' PKGBUILD`"
+if makepkg -f; then 
+    name=$1"-$(sed -n 's/pkgver=//p' PKGBUILD)-$(sed -n 's/pkgrel=//p' PKGBUILD)"
     echo Installing...
-    sudo pacman -U $name*.xz
+    sudo pacman -U "$name"*.xz
 fi
diff --git a/bak b/bak
index 5765934..0522491 100755
--- a/bak
+++ b/bak
@@ -18,16 +18,16 @@ for k in $*; do
     path=$(echo ${strip%/*} | sed "s#$HOME##")
     stamp="$(date +%y%m%d-%H%M%S)"
     name="$(echo $bakdir/$path/$folder-$stamp.tar.xz | sed 's#//#/#g')"
-    echo Archiving and compressing $name ...
-    mkdir -p $bakdir/$path
-    cd $k; cd ..
+    echo Archiving and compressing "$name" ...
+    mkdir -p "$bakdir"/"$path"
+    cd "$k" || return 127 ; cd ..
     if [ -n "$e" ]; then
-      echo Encrypting $name
-      tar --xz --atime-preserve -p -cO $folder | gpg $e - > $name.gpg
+      echo Encrypting "$name"
+      tar --xz --atime-preserve -p -cO "$folder" | gpg "$e" - > "$name".gpg
     else
-      tar --xz --atime-preserve -p -cf $name $folder
+      tar --xz --atime-preserve -p -cf "$name" "$folder"
     fi;
   else
-    echo Skipping $k, not a directory
+    echo Skipping "$k", not a directory
   fi
 done
diff --git a/newmail b/newmail
index 5443d10..d9d1620 100755
--- a/newmail
+++ b/newmail
@@ -4,18 +4,21 @@ servers="gmail posteo gwu"
 
 result=
 regexp='s#^machine \(.*\) login \(.*\) password \(.*\) port \([0-9]*\)$#-u \2:"\3" imaps://\1:\4/INBOX#'
-data=$(gpg --quiet --decrypt $HOME/.authinfo.gpg | grep 993)
+data=$(gpg --quiet --decrypt "$HOME"/.authinfo.gpg | grep 993)
 for server in $servers; do
-    line=$(echo "$data" | grep $server | head -n 1)
-    num=$(curl -s --ssl-reqd $(echo $line | sed "$regexp") -X 'SEARCH UNSEEN' | grep SEARCH | wc -w)
-    if [ "$num" != "2" ]; then
-        count=$(($num - 2))
+    line=$(echo "$data" | grep "$server" | head -n 1)
+    num=$(curl -s --ssl-reqd $(echo "$line" | sed "$regexp") -X 'SEARCH UNSEEN' | grep SEARCH | wc -w)
+    if [ "$num" != "0" ]; then
         if [ -z "$result" ]; then
-            result="$server: $count"
+            result="$server: $num"
         else
-            result="$result, $server: $count"
+            result="$result, $server: $num"
         fi
     fi
 done;
 
-[ -n "$result" ] && echo $result || true
+if [ -n "$result" ]; then
+    echo "$result"
+else
+    true
+fi;
diff --git a/oi.py b/oi.py
index af29a2e..eb51c83 100755
--- a/oi.py
+++ b/oi.py
@@ -22,3 +22,11 @@ def gmail_local_to_remote(folder):
     if folder == "INBOX": return folder
     elif folder in ["Sent", "All"]: return new + " Mail"
     return new
+
+def jhu_remote_to_local(folder):
+    if folder == "Sent Items": return "Sent"
+    else: return folder
+
+def jhu_local_to_remote(folder):
+    if folder == "Sent": return "Sent Items"
+    else: return folder
diff --git a/ratdm b/ratdm
index bacbef5..a97eb34 100755
--- a/ratdm
+++ b/ratdm
@@ -3,15 +3,15 @@
 font="DejaVu Sans Mono:size=20"
 nb='grey10'
 nf='grey'
-sb=grey
+sb='grey'
 sf='black'
 
-screen=$(ratpoison -c sdump | tr ',' '\n' | grep '1$')
-width=$(echo $screen | cut -d ' ' -f 4)
-height=$(echo $screen | cut -d ' ' -f 5)
-s=$(echo $screen | cut -d ' ' -f 1)
-w=$(($width/2))
-x=$(($width/4))
-y=$(($height/3))
+screen=$(ratpoison -c sdump | tr ',' '\n' | grep '0$')
+width=$(echo "$screen" | cut -d ' ' -f 5)
+height=$(echo "$screen" | cut -d ' ' -f 6)
+s=$(echo "$screen" | cut -d ' ' -f 2)
+w=$((width/2))
+x=$((width/4))
+y=$((height/3))
 
-dmenu -p "Select >" -l 16 -m $s -x $x -y $y -w $w -sb $sb -sf $sf -nb $nb -nf $nf -fn "$font" -i "$@"
+dmenu -p "Select >" -l 16 -m "$s" -x "$x" -y "$y" -w "$w" -sb "$sb" -sf "$sf" -nb "$nb" -nf "$nf" -fn "$font" -i "$@"
diff --git a/ratws b/ratws
index af49cd3..6dc09ce 100755
--- a/ratws
+++ b/ratws
@@ -1,8 +1,10 @@
 #!/usr/bin/env sh
 
 w=$(ratpoison -c windows)
-#[ "$1" == "-s" ] && p="Tab" && w=$(echo "$w" | grep '(surf)')
-#[ "$1" == "-w" ] && p="Windows" && w=$(echo "$w" | grep -v '(surf)')
-[ -z $w ] && exit
+[ "$1" = "-s" ] && p="Tab" && w=$(echo "$w" | grep '(surf)')
+[ "$1" = "-w" ] && p="Windows" && w=$(echo "$w" | grep -v '(surf)')
+[ -z "$w" ] && exit
 sel=$(echo "$w" | ratdm -p ${p:-All}' >' | cut -d ' ' -f 1)
-[ -n $sel ] && ratpoison -c "select $sel" || true
+if [ -n "$sel" ]; then
+    ratpoison -c "select $sel"
+fi;
diff --git a/sc b/sc
index f64e118..c0e7986 100755
--- a/sc
+++ b/sc
@@ -15,5 +15,5 @@ esac;
 
 if [ -n "$reset_ratpoison" ]; then
 	[ -n "$BACKGROUND_IMAGE" ] && feh --bg-scale "$BACKGROUND_IMAGE"
-	ratpoison -c restart
+	#ratpoison -c restart
 fi;
diff --git a/vcs b/vcs
index 33a54fa..4802fff 100755
--- a/vcs
+++ b/vcs
@@ -11,7 +11,7 @@ VCS_MOD=""
 VCS_REC=""
 SPC=""
 
-if [[ $1 == "--zsh-colour" ]]; then
+if [ "$1" = "--zsh-colour" ]; then
     nstr="%F{red}●%f"
     mstr="%F{11}●%f"
     rstr="%F{28}●%f"
@@ -27,35 +27,42 @@ else
     cEND=""
 fi
 
-if [[ -d ".git" || -d "../.git" || -d "../../.git" ]]; then
+if [ -d ".git" ] || [ -d "../.git" ] || [ -d "../../.git" ]; then
     outp=$(git status)
     VCS_STR="*"
     VCS_INF=$(echo "$outp" | head -n 1 | cut -d' ' -f 3-)
-    check "^Untracked files:$" "$outp"
-    [[ $? = 0 ]] && VCS_NEW=$nstr
-    check "^Changes not staged for commit:$" "$outp"
-    [[ $? = 0 ]] && VCS_MOD=$mstr
-    check "^Changes to be committed:$" "$outp"
-    [[ $?  = 0 ]] && VCS_REC=$rstr
-else if [[ -d "_darcs" || -d "../_darcs" || -d "../../_darcs" ]]; then
+    if check "^Untracked files:$" "$outp"; then
+        VCS_NEW=$nstr
+    fi;
+    if check "^Changes not staged for commit:$" "$outp"; then
+        VCS_MOD=$mstr
+    fi;
+    if check "^Changes to be committed:$" "$outp"; then
+        VCS_REC=$rstr
+    fi;
+elif [ -d "_darcs" ] || [ -d "../_darcs" ] || [ -d "../../_darcs" ]; then
     fls=$(darcs show files)
     VCS_STR="+"
     VCS_INF=$(darcs show repo | grep Default | cut -d : -f 3-)
     for f in ./*; do
-        if [[ -f $f ]]; then
-            echo "$fls" | grep -q $f
+        if [ -f "$f" ]; then
+            echo "$fls" | grep -q "$f"
         else
             true
         fi;
-        if [[ ! $? = 0 ]]; then
+        if [ ! $? = 0 ]; then
             VCS_NEW=$nstr;
             break;
         fi;
     done;
     news=$(darcs what)$
-    check "^No changes" "$news"
-    [[ $? = 0 ]] || VCS_REC=$rstr
-fi; fi;
+    if check "^No changes" "$news"; then
+        true
+    else
+        VCS_REC=$rstr;
+    fi;
+   
+fi;
 
 [ -n "$VCS_NEW$VCS_MOD$VCS_REC" ] && SPC=" "
 [ -n "$VCS_STR" ] && echo "$cFST$VCS_STR$cEND{$cSND$VCS_INF$cEND$SPC$VCS_NEW$VCS_MOD$VCS_REC}"
diff --git a/vol b/vol
index 662b92e..29d6a8a 100755
--- a/vol
+++ b/vol
@@ -2,7 +2,7 @@
 
 # A small volume control script for the laptop
 
-if [ "$1" == "--headphone" ]; then
+if [ "$1" = "--headphone" ]; then
     shift;
     mixer="Headphone"
 else
@@ -12,15 +12,15 @@ fi;
 cmd="amixer set $mixer"
 fle=$HOME/.vol
 
-echo -n $mixer\ > $fle
+echo -n "$mixer"\ > "$fle"
 case "$1" in
   "--up") $cmd 2%+;;
   "--down") $cmd 2%-;;
   *) $cmd toggle;;
-esac | tail -n 1 | cut -d: -f 2 | cut -d\  -f 4,6 | tr -d '[]'  >> $fle
+esac | tail -n 1 | cut -d: -f 2 | cut -d\  -f 4,6 | tr -d '[]'  >> "$fle"
 
-for c in "set bargravity ne" "echo Volume: `cat $fle`" "set bargravity c"; do
+for c in "set bargravity ne" "echo Volume: $(cat "$fle")" "set bargravity c"; do
   ratpoison -c "$c"
-  echo $c
+  echo "$c"
 done
 
diff --git a/wls b/wls
index 62cf55a..5889f9b 100755
--- a/wls
+++ b/wls
@@ -12,34 +12,34 @@ connect() {
 
 dird="${HOME}/.config/wireless"
 
-sudo killall wpa_supplicant &> /dev/null
-sudo dhcpcd -k $dev &> /dev/null
-sudo ip link set $dev up &> /dev/null
+sudo killall wpa_supplicant
+sudo dhcpcd -k $dev
+sudo ip link set $dev up
 
 ssids=$(sudo iw dev $dev scan | grep SSID | cut -d\  -f 2-)
 for s in $ssids; do
     if [ -f "$dird/$s" ]; then
         echo -n "Connect to $s? [y]/* "
-        y=""; read y;
-        if [ -z $y ]; then
+        y=""; read -r y;
+        if [ -z "$y" ]; then
             connect "$dird/$s"
             exit 0;
         fi;
     fi;     
 done;
     
-ls $dird
+ls "$dird"
 echo -n "--> "
-read ssid
+read -r ssid
 
 if [ ! -f "$dird/$ssid" ]; then
 	  echo Creating new network profile, enter passphrase: 
-	  read pass
-	  wpa_passphrase $ssid "$pass" > $dird/$ssid
+	  read -r pass
+	  wpa_passphrase "$ssid" "$pass" > "$dird"/"$ssid"
 	  echo -n "Edit file (y/[n])? "
-	  read edit
-	  if [ "$edit" == "y" ]; then
-		    $EDITOR $dird/$ssid
+	  read -r edit
+	  if [ "$edit" = "y" ]; then
+		    $EDITOR "$dird"/"$ssid"
 	  fi;
 fi;