Fix up how serial ports are detected

Author: tclem

plugin/vim-arduino

@@ -53,12 +53,12 @@ done
 
 # try an find a serial port automatically if one is not passsed in.
 if [ -z "$port" ]
-echo "Auto detecting serial port"
 then port=$(ls /dev/tty.* | grep usb)
+echo "Auto detecting serial port"
 fi
 if [ -z "$port" ]
-echo "No usb serial port found. Faking one so we can still compile."
 then port="/dev/tty."
+echo "No usb serial port found. Faking one so we can still compile."
 fi
 
 # bail out if no serial port found.
@@ -75,10 +75,12 @@ fi
 
 # echo "Compiling '$pde_file' for board $board on serial port $port"
 
+sketchbook=$(echo $HOME/Documents/Arduino)
+
 DIR="$( cd "$( dirname "$0" )" && pwd )"
 java \
   -Djava.library.path=/Applications/Arduino.app/Contents/Resources/Java \
   -d32 \
-  -Dfile.encoding=MacRoman \
+  -Darduino.sketchbook="$sketchbook" \
   -Djava.awt.headless=true \
   -jar "$DIR/vim-arduino-cli.jar" "$switch" "$pde_file" "$port" "$board"

plugin/vim-arduino-cli.jar

@@ -75,6 +75,14 @@ function! s:CheckFile()
   endif
 endfunction
 
+function! s:PrintStatus(result)
+  if a:result == 0
+    echohl Statement | echomsg "Succeeded." | echohl None
+  else
+    echohl WarningMsg | echomsg "Failed." | echohl None
+  endif
+endfunction
+
 " Private: Compile or deploy code
 "
 " Returns nothing.
@@ -96,14 +104,9 @@ function! s:InvokeArduinoCli(deploy)
           \ shellescape(l:f_name)
     " echo l:command
     let l:result = system(l:command)
-    if v:shell_error == 0
-      echomsg "Done"
-    else
-      echohl WarningMsg
-      echomsg "Compilation Failed"
-      echohl None
-      echo l:result
-    endif
+    call s:PrintStatus(v:shell_error)
+    echo l:result
+    call s:PrintStatus(v:shell_error)
   endif
 
 endfunction