diff --git a/vendor/bin/cmder_diag.cmd b/vendor/bin/cmder_diag.cmd
index 66f41a1..f526cff 100644
--- a/vendor/bin/cmder_diag.cmd
+++ b/vendor/bin/cmder_diag.cmd
@@ -1,5 +1,29 @@
 @echo off
 
+(echo.
+echo ------------------------------------
+echo set
+echo ------------------------------------
+set
+
+echo.
+echo ------------------------------------
+echo where git
+echo ------------------------------------
+where git
+
+echo.
+echo ------------------------------------
+echo where clink
+echo ------------------------------------
+where clink
+
+echo.
+echo ------------------------------------
+echo systeminfo
+echo ------------------------------------
+systeminfo
+
 echo ------------------------------------
 echo dir "%cmder_root%"
 echo ------------------------------------
@@ -23,25 +47,15 @@ echo dir /s "%cmder_root%\config"
 echo ------------------------------------
 dir /s "%cmder_root%\config"
 
-echo.
-echo ------------------------------------
-echo set
-echo ------------------------------------
-set
-
-echo.
-echo ------------------------------------
-echo where git
-echo ------------------------------------
-where git
-
-echo.
-echo ------------------------------------
-echo systeminfo
-echo ------------------------------------
-systeminfo
-
 echo.
 echo ------------------------------------
 echo Make sure you sanitize this output of private data prior to posting it online for review by the CMDER Team!
 echo ------------------------------------
+) > "%temp%\cmder_diag_cmd.log"
+
+type "%temp%\cmder_diag_cmd.log"
+
+echo.
+echo Above output was saved in "%temp%\cmder_diag_cmd.log"
+
+
diff --git a/vendor/bin/cmder_diag.ps1 b/vendor/bin/cmder_diag.ps1
index f6ff930..e4ddb16 100644
--- a/vendor/bin/cmder_diag.ps1
+++ b/vendor/bin/cmder_diag.ps1
@@ -1,45 +1,64 @@
-write-host ------------------------------------
-write-host get-childitem "$env:CMDER_ROOT"
-write-host ------------------------------------
-get-childitem "$env:CMDER_ROOT"
+if (test-path  $env:temp\cmder_diag_ps.log) {
+  remove-item $env:temp\cmder_diag_ps.log
+}
 
-write-host ''
-write-host ------------------------------------
-write-host get-childitem "$env:CMDER_ROOT/vendor"
-write-host ------------------------------------
-get-childitem "$env:CMDER_ROOT/vendor"
+$cmder_diag = {
+""
+"------------------------------------"
+"get-childitem env:"
+"------------------------------------"
+get-childitem env: | ft -autosize -wrap 2>&1
 
-write-host ''
-write-host ------------------------------------
-write-host get-childitem -s "$env:CMDER_ROOT/bin"
-write-host ------------------------------------
-get-childitem -s "$env:CMDER_ROOT/bin"
+""
+"------------------------------------"
+"get-command git -all -ErrorAction SilentlyContinue"
+"------------------------------------"
+get-command git -all -ErrorAction SilentlyContinue
 
-write-host ''
-write-host ------------------------------------
-write-host get-childitem -s "$env:CMDER_ROOT/config"
-write-host ------------------------------------
-get-childitem -s "$env:CMDER_ROOT/config"
+""
+"------------------------------------"
+"get-command clink -all -ErrorAction SilentlyContinue"
+"------------------------------------"
+get-command clink -all -ErrorAction SilentlyContinue
 
-write-host ''
-write-host ------------------------------------
-write-host get-childitem env:
-write-host ------------------------------------
-get-childitem env: |ft -autosize -wrap
+""
+"------------------------------------"
+"systeminfo"
+"------------------------------------"
+systeminfo 2>&1
 
-write-host ''
-write-host ------------------------------------
-write-host get-command git
-write-host ------------------------------------
-get-command git
+"------------------------------------"
+"get-childitem '$env:CMDER_ROOT'"
+"------------------------------------"
+get-childitem "$env:CMDER_ROOT" |ft LastWriteTime,mode,length,FullName
 
-write-host ''
-write-host ------------------------------------
-write-host systeminfo
-write-host ------------------------------------
-systeminfo
+""
+"------------------------------------"
+"get-childitem '$env:CMDER_ROOT/vendor'"
+"------------------------------------"
+get-childitem "$env:CMDER_ROOT/vendor" |ft LastWriteTime,mode,length,FullName
 
-write-host ''
-write-host ------------------------------------
-write-host Make sure you sanitize this output of private data prior to posting it online for review by the CMDER Team!
-write-host ------------------------------------
+""
+"------------------------------------"
+"get-childitem -s '$env:CMDER_ROOT/bin'"
+"------------------------------------"
+get-childitem -s "$env:CMDER_ROOT/bin" |ft LastWriteTime,mode,length,FullName
+
+""
+"------------------------------------"
+"get-childitem -s '$env:CMDER_ROOT/config'"
+"------------------------------------"
+get-childitem -s "$env:CMDER_ROOT/config" |ft LastWriteTime,mode,length,FullName
+
+""
+"------------------------------------"
+"Make sure you sanitize this output of private data prior to posting it online for review by the CMDER Team!"
+"------------------------------------"
+}
+
+& $cmder_diag | out-file -filePath $env:temp\cmder_diag_ps.log
+
+get-content "$env:temp\cmder_diag_ps.log"
+
+write-host ""
+write-host Above output was saved in "$env:temp\cmder_diag_ps.log"
diff --git a/vendor/bin/cmder_diag.sh b/vendor/bin/cmder_diag.sh
index fa49445..993c366 100644
--- a/vendor/bin/cmder_diag.sh
+++ b/vendor/bin/cmder_diag.sh
@@ -1,45 +1,61 @@
-echo ------------------------------------
-echo ls -la "$CMDER_ROOT"
-echo ------------------------------------
-ls -la "$CMDER_ROOT"
+#!/usr/bin/env bash
 
-echo ''
-echo ------------------------------------
-echo ls -la "$CMDER_ROOT/vendor"
-echo ------------------------------------
-ls -la "$CMDER_ROOT/vendor"
+[[ -f "$TEMP/cmder_diag_sh.log" ]] && rm -f  "$TEMP/cmder_diag_sh.log"
 
-echo ''
-echo ------------------------------------
-echo ls -la /s "$CMDER_ROOT/bin"
-echo ------------------------------------
-ls -laR /s "$CMDER_ROOT/bin"
-
-echo ''
-echo ------------------------------------
-echo ls -la /s "$CMDER_ROOT/config"
-echo ------------------------------------
-ls -laR /s "$CMDER_ROOT/config"
-
-echo ''
+(echo ''
 echo ------------------------------------
 echo env
 echo ------------------------------------
-env
+env 2>&1
 
 echo ''
 echo ------------------------------------
 echo which git
 echo ------------------------------------
+which git 2>&1
+
+echo ''
+echo ------------------------------------
+echo which clink
+echo ------------------------------------
+which clink 2>&1
 
-which git
 echo ''
 echo ------------------------------------
 echo systeminfo
 echo ------------------------------------
-systeminfo
+systeminfo 2>&1
+
+echo ------------------------------------
+echo ls -la "$CMDER_ROOT"
+echo ------------------------------------
+ls -la "$CMDER_ROOT" 2>&1
+
+echo ''
+echo ------------------------------------
+echo ls -la "$CMDER_ROOT/vendor"
+echo ------------------------------------
+ls -la "$CMDER_ROOT/vendor" 2>&1
+
+echo ''
+echo ------------------------------------
+echo ls -la /s "$CMDER_ROOT/bin"
+echo ------------------------------------
+ls -laR /s "$CMDER_ROOT/bin" 2>&1
+
+echo ''
+echo ------------------------------------
+echo ls -la /s "$CMDER_ROOT/config"
+echo ------------------------------------
+ls -laR /s "$CMDER_ROOT/config" 2>&1
 
 echo ''
 echo ------------------------------------
 echo Make sure you sanitize this output of private data prior to posting it online for review by the CMDER Team!
 echo ------------------------------------
+) > "$TEMP/cmder_diag_sh.log"
+
+cat "$TEMP/cmder_diag_sh.log"
+
+echo ''
+echo Above output was saved in "$TEMP/cmder_diag_sh.log"