From e860fabb0fd7f9b1fc951f6c15a932c625fc6de0 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Tue, 11 Dec 2018 10:33:38 -0500
Subject: [PATCH] bash_aliases: move cygwin-specific aliases to
 bash_aliases.d/cygwin

---
 bash_aliases          | 60 -------------------------------------------
 bash_aliases.d/cygwin | 59 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 60 deletions(-)
 create mode 100644 bash_aliases.d/cygwin

diff --git a/bash_aliases b/bash_aliases
index b565274..f997679 100644
--- a/bash_aliases
+++ b/bash_aliases
@@ -323,66 +323,6 @@ HISTCONTROL='ignoreboth'
 HISTSIZE=5000
 HISTFILESIZE=${HISTSIZE}
 
-###########################################################################
-# cygwin-specific
-###########################################################################
-if [[ -e /bin/cygwin1.dll ]]; then
-  alias ip="ipconfig | grep -E 'IP(v4)? Address' | sed -e 's/.*: //'"
-
-  function cs
-  {
-    while [[ "$1" != "" ]]
-    do
-      if [[ -e "$1" ]]; then
-        dn=$(dirname "$1")
-        bn=$(basename "$1")
-        (cd "$dn"; HOME='' cygstart "$bn")
-      else
-        HOME='' cygstart "$1"
-      fi
-      shift
-    done
-  }
-
-  function winpython
-  {
-    local winpython=/c/Python27/python.exe
-    if [[ "$1" == "" ]]; then
-      ${winpython} -i
-    else
-      ${winpython} "$@"
-    fi
-  }
-
-  winpath="$(echo $PATH | sed -e 's/:/\n/g' | grep cygdrive | tr '\n' ':' | sed -e 's/:*$//')"
-
-  export SSH_AUTH_SOCK=/tmp/.ssh_socket
-
-  function ssh_agent_start
-  {
-    # cygwin ssh-agent support, from
-    # http://www.webweavertech.com/ovidiu/weblog/archives/000326.html
-
-    ssh-add -l >/dev/null 2>&1
-
-    if [ $? = 2 ]; then
-      # exit status 2 means we couldn't connect to ssh-agent,
-      # so let's start one now
-      rm -f $SSH_AUTH_SOCK
-      ssh-agent -a $SSH_AUTH_SOCK >/tmp/.ssh-script
-      . /tmp/.ssh-script
-      echo $SSH_AGENT_PID >/tmp/.ssh-agent-pid
-      ssh-add ~/.ssh/JoshHoltropGentex
-    fi
-  }
-
-  function ssh_agent_stop
-  {
-    pid=$(cat /tmp/.ssh-agent-pid)
-    kill $pid
-  }
-fi
-
 # source any machine-local aliases
 # this way ~/.bash_aliases can be shared in many places
 if [ -f ~/.bash_aliases.local ]; then
diff --git a/bash_aliases.d/cygwin b/bash_aliases.d/cygwin
new file mode 100644
index 0000000..d4c712d
--- /dev/null
+++ b/bash_aliases.d/cygwin
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+if [[ -e /bin/cygwin1.dll ]]; then
+  alias ip="ipconfig | grep -E 'IP(v4)? Address' | sed -e 's/.*: //'"
+
+  # o: "open" files as if double-clicked in Windows explorer
+  function o
+  {
+    while [[ "$1" != "" ]]
+    do
+      if [[ -e "$1" ]]; then
+        dn=$(dirname "$1")
+        bn=$(basename "$1")
+        (cd "$dn"; HOME='' cygstart "$bn")
+      else
+        HOME='' cygstart "$1"
+      fi
+      shift
+    done
+  }
+
+  function winpython
+  {
+    local winpython=/c/Python27/python.exe
+    if [[ "$1" == "" ]]; then
+      ${winpython} -i
+    else
+      ${winpython} "$@"
+    fi
+  }
+
+  winpath="$(echo $PATH | sed -e 's/:/\n/g' | grep cygdrive | tr '\n' ':' | sed -e 's/:*$//')"
+
+  export SSH_AUTH_SOCK=/tmp/.ssh_socket
+
+  function ssh_agent_start
+  {
+    # cygwin ssh-agent support, from
+    # http://www.webweavertech.com/ovidiu/weblog/archives/000326.html
+
+    ssh-add -l >/dev/null 2>&1
+
+    if [ $? = 2 ]; then
+      # exit status 2 means we couldn't connect to ssh-agent,
+      # so let's start one now
+      rm -f $SSH_AUTH_SOCK
+      ssh-agent -a $SSH_AUTH_SOCK >/tmp/.ssh-script
+      . /tmp/.ssh-script
+      echo $SSH_AGENT_PID >/tmp/.ssh-agent-pid
+      ssh-add ~/.ssh/JoshHoltropGentex
+    fi
+  }
+
+  function ssh_agent_stop
+  {
+    pid=$(cat /tmp/.ssh-agent-pid)
+    kill $pid
+  }
+fi