#692 Improve Windows Terminal with gitbash

devonfw · Jun 9, 2022 · a387622 · a387622
1 parent 6bfdffe
commit a387622
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 2 deletions.
diff --git a/documentation/advanced-tooling-windows.asciidoc b/documentation/advanced-tooling-windows.asciidoc
@@ -23,6 +23,7 @@ Just right-click on the folder you would like to open in a terminal and choose f
 * Open devonfw PowerShell here
 * Open devonfw Cygwin Bash here (only if cygwin was installed during setup)
 * Open devonfw cmd shell in Windows Terminal here (only if Windows Terminal is installed on the system)
+* Open devonfw gitbash in Windows Terminal here (only if Windows Terminal is installed on the system)
 
 == Tabs everywhere
 Many people got used to _tabs_ that have been introduced by all major browsers:

diff --git a/scripts/src/main/resources/setup.bat b/scripts/src/main/resources/setup.bat
@@ -10,6 +10,7 @@ reg import system/windows/power-shell/devon-power-shell.reg
 dir %USERPROFILE%\AppData\Local\Microsoft\WindowsApps\wt.exe >NUL 2>NUL
 if "%ERRORLEVEL%" == "0" (
   reg import system/windows/wt-cmd/devon-wt-cmd.reg
+  reg import system/windows/wt-cmd/devon-wt-gitbash.reg
 )
 
 for /F "usebackq tokens=2*" %%O in (`call "%SystemRoot%"\system32\reg.exe query "HKLM\Software\Cygwin\setup" /v "rootdir" 2^>nul ^| "%SystemRoot%\system32\findstr.exe" REG_SZ`) do set CYGWIN_HOME=%%P

diff --git a/scripts/src/main/resources/system/windows/devon-uninstall.reg b/scripts/src/main/resources/system/windows/devon-uninstall.reg
@@ -11,4 +11,8 @@ Windows Registry Editor Version 5.00
 [-HKEY_CURRENT_USER\SOFTWARE\Classes\Directory\shell\devon_wt_cmd]
 [-HKEY_CURRENT_USER\SOFTWARE\Classes\Directory\shell\devon_wt_cmd\command]
 [-HKEY_CURRENT_USER\SOFTWARE\Classes\Directory\Background\shell\devon_wt_cmd]
-[-HKEY_CURRENT_USER\SOFTWARE\Classes\Directory\Background\shell\devon_wt_cmd\command]
+[-HKEY_CURRENT_USER\SOFTWARE\Classes\Directory\Background\shell\devon_wt_cmd\command]
+[-HKEY_CURRENT_USER\SOFTWARE\Classes\Directory\shell\devon_wt_gitbash]
+[-HKEY_CURRENT_USER\SOFTWARE\Classes\Directory\shell\devon_wt_gitbash\command]
+[-HKEY_CURRENT_USER\SOFTWARE\Classes\Directory\Background\shell\devon_wt_gitbash]
+[-HKEY_CURRENT_USER\SOFTWARE\Classes\Directory\Background\shell\devon_wt_gitbash\command]
diff --git a/scripts/src/main/resources/system/windows/windows-terminal/devon-wt-gitbash-uninstall.reg b/scripts/src/main/resources/system/windows/windows-terminal/devon-wt-gitbash-uninstall.reg
@@ -0,0 +1,6 @@
+Windows Registry Editor Version 5.00
+
+[-HKEY_CURRENT_USER\SOFTWARE\Classes\Directory\shell\devon_wt_gitbash]
+[-HKEY_CURRENT_USER\SOFTWARE\Classes\Directory\shell\devon_wt_gitbash\command]
+[-HKEY_CURRENT_USER\SOFTWARE\Classes\Directory\Background\shell\devon_wt_gitbash]
+[-HKEY_CURRENT_USER\SOFTWARE\Classes\Directory\Background\shell\devon_wt_gitbash\command]
diff --git a/scripts/src/main/resources/system/windows/windows-terminal/devon-wt-gitbash.reg b/scripts/src/main/resources/system/windows/windows-terminal/devon-wt-gitbash.reg
diff --git a/scripts/src/main/resources/system/windows/windows-terminal/install.bat b/scripts/src/main/resources/system/windows/windows-terminal/install.bat
@@ -1 +1,2 @@
 regedit.exe /S devon-wt-cmd.reg	
+regedit.exe /S devon-wt-gitbash.reg
diff --git a/scripts/src/main/resources/system/windows/windows-terminal/uninstall.bat b/scripts/src/main/resources/system/windows/windows-terminal/uninstall.bat
@@ -1 +1,2 @@
-regedit.exe /S devon-wt-cmd-uninstall.reg
+regedit.exe /S devon-wt-cmd-uninstall.reg
+regedit.exe /S devon-wt-gitbash-uninstall.reg
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		regedit.exe /S devon-wt-cmd.reg
		regedit.exe /S devon-wt-gitbash.reg