From f522cc4101d55e93d060a2d88974ef702821d750 Mon Sep 17 00:00:00 2001
From: Alex Berry <alexberry@outlook.com>
Date: Mon, 15 Jul 2019 23:14:27 +0100
Subject: [PATCH] Updated Readme and config file, no longer need compiled
 wslbridge (sigh)

---
 config.xml => ConEmu.xml | 28 ++++++++++++++++++++++++----
 README.md                |  5 +++--
 2 files changed, 27 insertions(+), 6 deletions(-)
 rename config.xml => ConEmu.xml (96%)

diff --git a/config.xml b/ConEmu.xml
similarity index 96%
rename from config.xml
rename to ConEmu.xml
index a282845..338a7b7 100644
--- a/config.xml
+++ b/ConEmu.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <key name="Software">
 	<key name="ConEmu">
-		<key name=".Vanilla" modified="2019-07-15 22:33:01" build="190714">
+		<key name=".Vanilla" modified="2019-07-15 23:12:27" build="190714">
 			<value name="Language" type="string" data="en"/>
 			<value name="StartType" type="hex" data="02"/>
 			<value name="CmdLine" type="string" data=""/>
 			<value name="StartTasksFile" type="string" data=""/>
-			<value name="StartTasksName" type="string" data="{Shells::Ubuntu}"/>
+			<value name="StartTasksName" type="string" data="{Bash::WSL}"/>
 			<value name="StartFarFolders" type="hex" data="00"/>
 			<value name="StartFarEditors" type="hex" data="00"/>
 			<value name="StartCreateDelay" type="ulong" data="100"/>
@@ -83,6 +83,8 @@
 			<value name="JumpListAutoUpdate" type="hex" data="01"/>
 			<value name="SaveCmdHistory" type="hex" data="01"/>
 			<value name="CmdLineHistory" type="multi">
+				<line data="{Bash::WSL}"/>
+				<line data="{Bash::bash}"/>
 				<line data="{Shells::PowerShell}"/>
 				<line data="ubuntu"/>
 				<line data="cmd.exe"/>
@@ -604,8 +606,8 @@
 				<value name="DndRKey" type="hex" data="A2"/>
 				<value name="WndDragKey" type="dword" data="00121101"/>
 			</key>
-			<key name="Tasks" modified="2019-07-15 21:26:53" build="190714">
-				<value name="Count" type="long" data="10"/>
+			<key name="Tasks" modified="2019-07-15 23:12:27" build="190714">
+				<value name="Count" type="long" data="12"/>
 				<key name="Task1" modified="2019-07-15 22:33:01" build="190714">
 					<value name="Name" type="string" data="{Shells::Ubuntu}"/>
 					<value name="Flags" type="dword" data="00000005"/>
@@ -697,6 +699,24 @@
 					<value name="Count" type="long" data="1"/>
 					<value name="Cmd1" type="string" data='*cmd.exe /k Title Chocolatey &amp; "%ConEmuBaseDir%\Addons\ChocolateyAbout.cmd"'/>
 				</key>
+				<key name="Task11" modified="2019-07-15 23:12:27" build="190714">
+					<value name="Name" type="string" data="{Bash::CygWin bash}"/>
+					<value name="Flags" type="dword" data="00000004"/>
+					<value name="Hotkey" type="dword" data="00000000"/>
+					<value name="GuiArgs" type="string" data=""/>
+					<value name="Active" type="long" data="0"/>
+					<value name="Count" type="long" data="1"/>
+					<value name="Cmd1" type="string" data='set CHERE_INVOKING=1 &amp; set "PATH=%ConEmuDrive%\cygwin64\bin;%PATH%" &amp; %ConEmuBaseDirShort%\conemu-cyg-64.exe -new_console:p %ConEmuDrive%\cygwin64\bin\bash.exe --login -i -new_console:C:"%ConEmuDrive%\cygwin64\Cygwin.ico"'/>
+				</key>
+				<key name="Task12" modified="2019-07-15 23:12:27" build="190714">
+					<value name="Name" type="string" data="{Bash::WSL}"/>
+					<value name="Flags" type="dword" data="00000004"/>
+					<value name="Hotkey" type="dword" data="00000000"/>
+					<value name="GuiArgs" type="string" data='/dir %CD% /icon "%USERPROFILE%\AppData\Local\lxss\bash.ico"'/>
+					<value name="Active" type="long" data="0"/>
+					<value name="Count" type="long" data="1"/>
+					<value name="Cmd1" type="string" data='set "PATH=%ConEmuBaseDirShort%\wsl;%PATH%" &amp; %ConEmuBaseDirShort%\conemu-cyg-64.exe --wsl -cur_console:pm:/mnt -C "~" -t zsh -l'/>
+				</key>
 			</key>
 			<key name="Apps" modified="2019-07-15 21:26:53" build="190714">
 				<value name="Count" type="long" data="0"/>
diff --git a/README.md b/README.md
index b772aec..2ff2102 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,9 @@
 
 Pre-reqs
 * Install conemu
-* Install cygwin (no packages needed)
-* Copy contents of wslbridge folder to c:\cygwin64\bin\
+* ~~Install cygwin (no packages needed)~~
+* ~~Copy contents of wslbridge folder to c:\cygwin64\bin\~~
+* Copy ConEmu.xml to C:/Users/_username_/AppData/Roaming/ConEmu.xml
 
 This is a working conemu config. It contains some of the following modifications: