From ee352550ae647e9c77072189812d24b714225083 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=9F=E9=85=8C=20=E9=B5=AC=E5=85=84?= <tgckpg@gmail.com>
Date: Thu, 24 Aug 2017 01:00:59 +0800
Subject: [PATCH] Renew bat file when location changed

---
 bash/bashrc/sources/10_aliases | 3 +++
 bash/bashrc/sources/11_vs_env  | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/bash/bashrc/sources/10_aliases b/bash/bashrc/sources/10_aliases
index d7b1208..3879791 100755
--- a/bash/bashrc/sources/10_aliases
+++ b/bash/bashrc/sources/10_aliases
@@ -35,3 +35,6 @@ alias wget='wget --directory-prefix="$HOME/Downloads"'
 
 # ssh-agent key lifetime
 alias ssh-add="ssh-add -t 43200"
+
+# Pretty print sqlite3
+alias sqlite3="sqlite3 -header -column"
diff --git a/bash/bashrc/sources/11_vs_env b/bash/bashrc/sources/11_vs_env
index 1b361bc..5963f95 100755
--- a/bash/bashrc/sources/11_vs_env
+++ b/bash/bashrc/sources/11_vs_env
@@ -4,7 +4,6 @@ if ! $IS_CYGWIN; then
 	return
 fi
 
-echo $PATH | grep -q MSBuild
 if [ -n "$FrameworkVersion" ]; then
 	alias vsshell='echo "FrameworkVersion $FrameworkVersion"'
 	return
@@ -22,7 +21,10 @@ function vsshell {
 }
 
 if [ -f "$VS_SHELL_BAT" ]; then
-	return
+	_PATH=$( cygpath "$( grep -o "^@REM FILE_PATH: .\+" "$VS_SHELL_BAT" | cut -c 17- )" )
+	if [ -f "$_PATH" ]; then
+		return
+	fi
 fi
 
 START_MENU="$( cygpath $ProgramData )/Microsoft/Windows/Start Menu/"
@@ -30,5 +32,6 @@ START_MENU="$( cygpath $ProgramData )/Microsoft/Windows/Start Menu/"
 _PATH=$( find "$START_MENU" -name "*Command Prompt*" | grep "Visual Studio" | grep x64 | grep Native | xargs -I % readshortcut % -r | grep -o "\"\([^\"]\+\)\"" )
 
 echo "@echo off" > "$VS_SHELL_BAT"
+echo "@REM FILE_PATH: ${_PATH:1:-1}" >> "$VS_SHELL_BAT"
 echo "CALL $_PATH" >> "$VS_SHELL_BAT"
 echo "START $( where mintty ) -i /Cygwin-Terminal.ico -" >> "$VS_SHELL_BAT"