diff --git a/vendor/lib/lib_path.cmd b/vendor/lib/lib_path.cmd index dd76c68..4a9f8b9 100644 --- a/vendor/lib/lib_path.cmd +++ b/vendor/lib/lib_path.cmd @@ -149,8 +149,8 @@ exit /b exit /b :enhance_path_recursive - call :set_path_recursive "%~1" "%~2" "%~3" - exit /b + call :set_path_recursive "%~1" "%~2" "%~3" + exit /b :set_path_recursive :::=============================================================================== @@ -206,9 +206,9 @@ exit /b if "%fast_init%" == "1" ( if "%add_to_path%" neq "" ( if "%position%" == "append" ( - set "path=%path%;%add_to_path%" + set "path=%path%;%add_to_path%" ) else ( - set "path=%add_to_path%;%path%" + set "path=%add_to_path%;%path%" ) ) ) @@ -218,18 +218,18 @@ exit /b exit /b ) - %print_debug% :enhance_path_recursive "Env Var - add_path=%add_to_path%" - %print_debug% :enhance_path_recursive "Env Var - position=%position%" - %print_debug% :enhance_path_recursive "Env Var - depth=%depth%" - %print_debug% :enhance_path_recursive "Env Var - max_depth=%max_depth%" + %print_debug% :set_path_recursive "Env Var - add_path=%add_to_path%" + %print_debug% :set_path_recursive "Env Var - position=%position%" + %print_debug% :set_path_recursive "Env Var - depth=%depth%" + %print_debug% :set_path_recursive "Env Var - max_depth=%max_depth%" if %max_depth% gtr %depth% ( if "%add_to_path%" neq "" ( %print_debug% :set_path_recursive "Adding parent directory - '%add_to_path%'" if "%position%" == "append" ( - set "path=%path%;%add_to_path%" + set "path=%path%;%add_to_path%" ) else ( - set "path=%add_to_path%;%path%" + set "path=%add_to_path%;%path%" ) ) call :set_depth @@ -250,9 +250,9 @@ exit /b ) for /d %%i in ("%add_path%\*") do ( - %print_debug% :enhance_path_recursive "Env Var BEFORE - depth=%depth%" - %print_debug% :enhance_path_recursive "Found Subdirectory - '%%~fi'" - call :enhance_path_recursive "%%~fi" %depth% %max_depth% %position% - %print_debug% :enhance_path_recursive "Env Var AFTER- depth=%depth%" + %print_debug% :set_path_recursive "Env Var BEFORE - depth=%depth%" + %print_debug% :set_path_recursive "Found Subdirectory - '%%~fi'" + call :set_path_recursive "%%~fi" %depth% %max_depth% %position% + %print_debug% :set_path_recursive "Env Var AFTER- depth=%depth%" ) exit /b diff --git a/vendor/psmodules/Cmder.ps1 b/vendor/psmodules/Cmder.ps1 index 6c2f531..c9a11df 100644 --- a/vendor/psmodules/Cmder.ps1 +++ b/vendor/psmodules/Cmder.ps1 @@ -179,27 +179,27 @@ function getGitStatusSetting() { } function yOrn( $question ) { - Do { - $Answer = Read-Host -Prompt "`n${question}? (y/n) " - } - Until ($Answer -eq 'y' -or $Answer -eq 'n' -or $Answer -eq 'yes' -or $Answer -eq 'no') + Do { + $Answer = Read-Host -Prompt "`n${question}? (y/n) " + } + Until ($Answer -eq 'y' -or $Answer -eq 'n' -or $Answer -eq 'yes' -or $Answer -eq 'no') - return $Answer + return $Answer } function templateExpand($template_filename, $outfile) { - $template = Get-Content "$template_filename" -Raw + $template = Get-Content "$template_filename" -Raw - $expanded = Invoke-Expression "@`"`r`n$template`r`n`"@" + $expanded = Invoke-Expression "@`"`r`n$template`r`n`"@" - $overwrite = 'y' - if ((test-path "$outfile")) { - $overwrite = yOrn "'$outfile' already exists do you want to overwrite it" - } + $overwrite = 'y' + if ((test-path "$outfile")) { + $overwrite = yOrn "'$outfile' already exists do you want to overwrite it" + } - if ($overwrite -match 'y') { - $expanded | out-file -ErrorAction silentlycontinue -encoding ascii "$outfile" - } else { - write-host "Skipping Cmder '$shell' config generation at user request!" - } + if ($overwrite -match 'y') { + $expanded | out-file -ErrorAction silentlycontinue -encoding ascii "$outfile" + } else { + write-host "Skipping Cmder '$shell' config generation at user request!" + } }