Merge f5b086c89c into 1b88bf2127

.tmux.conf

@@ -358,6 +358,11 @@ run 'cut -c3- "$TMUX_CONF" | sh -s _apply_configuration'
 #         count=$((count + 1))
 #       done
 #       ;;
+#     *FreeBSD*)
+#       discharging=$(sysctl -n 'hw.acpi.battery.state' | grep -q 1 && echo "true" || echo "false")
+#       charge=$(awk -v charge="$(sysctl -n 'hw.acpi.battery.life')" 'BEGIN { print charge / 100 }')
+#       count=1
+#       ;;
 #   esac
 #   if [ "$count" -ne 0 ]; then
 #     charge=$(awk -v charge="$charge" -v count="$count" 'BEGIN { print charge / count }')
@@ -550,7 +555,7 @@ run 'cut -c3- "$TMUX_CONF" | sh -s _apply_configuration'
 #       '
 #       ;;
 #     *)
-#       ps -t "$pane_tty" -o user=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -o pid= -o ppid= -o command= | awk -v pane_pid="$pane_pid" '
+#       ps -t "/dev/$pane_tty" -o user=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -o pid= -o ppid= -o command= | awk -v pane_pid="$pane_pid" '
 #         ((/ssh/ && !/-W/) || !/ssh/) && !/tee/ {
 #           user[$2] = $1; if (!child[$3]) child[$3] = $2; pid=$2; $1 = $2 = $3 = ""; command[pid] = substr($0,4)
 #         }

README.md

@@ -108,6 +108,13 @@ Troubleshooting
    one, Powerline symbols will be broken.
 
    The alternative is to use the [Mintty terminal for WSL][wsltty].
+   
+ - **Will this work with the new [Windows Terminal]?**
+    
+    Yes, yes it will. Here's a screenshot:
+    
+    ![image](https://user-images.githubusercontent.com/6472374/66804257-a8225d00-ef2a-11e9-901a-318a3a22151f.png)
+ 
 
 [1681]: https://github.com/Microsoft/BashOnWindows/issues/1681
 [wsltty]: https://github.com/mintty/wsltty
@@ -384,3 +391,5 @@ font.
 ![regedit](https://cloud.githubusercontent.com/assets/553208/19741304/71a2f3ae-9bc0-11e6-96aa-4c09a812c313.png)
 
 [font linking]: https://msdn.microsoft.com/en-us/goglobal/bb688134.aspx
+
+[Windows Terminal]: https://github.com/microsoft/terminal