Merge branch 'stable'

* stable: (maint) update RefreshEnv messaging (chocolateyGH-996) Fix: RefreshEnv command throws errors
ferventcoder · Oct 3, 2016 · 70932d0 · 70932d0
2 parents 299a352 + 92035b7
commit 70932d0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/chocolatey.resources/helpers/chocolateyProfile.psm1 b/src/chocolatey.resources/helpers/chocolateyProfile.psm1
@@ -17,9 +17,10 @@ if (Get-Module chocolateyProfile) { return }
 
 $thisDirectory = (Split-Path -parent $MyInvocation.MyCommand.Definition)
 
+. $thisDirectory\functions\Write-FunctionCallLogMessage.ps1
 . $thisDirectory\functions\Get-EnvironmentVariable.ps1
 . $thisDirectory\functions\Get-EnvironmentVariableNames.ps1
 . $thisDirectory\functions\Update-SessionEnvironment.ps1
 . $thisDirectory\ChocolateyTabExpansion.ps1
 
-Export-ModuleMember -Alias refreshenv -Function 'Update-SessionEnvironment', 'TabExpansion'
+Export-ModuleMember -Alias refreshenv -Function 'Update-SessionEnvironment', 'TabExpansion'
diff --git a/src/chocolatey.resources/helpers/functions/Update-SessionEnvironment.ps1 b/src/chocolatey.resources/helpers/functions/Update-SessionEnvironment.ps1
@@ -54,7 +54,7 @@ None
   }
 
   if ($refreshEnv) {
-    Write-Output "Refreshing environment variables from the registry..."
+    Write-Output "Refreshing environment variables from the registry for powershell.exe. Please wait..."
   } else {
     Write-Verbose "Refreshing environment variables from the registry."
   }

diff --git a/src/chocolatey.resources/redirects/RefreshEnv.cmd b/src/chocolatey.resources/redirects/RefreshEnv.cmd
@@ -9,7 +9,7 @@
 :: environment every time you want environment changes to propagate
 
 ::echo "RefreshEnv.cmd only works from cmd.exe, please install the Chocolatey Profile to take advantage of refreshenv from PowerShell"
-echo | set /p dummy="Refreshing environment variables from registry for cmd.exe. Please wait... "
+echo | set /p dummy="Refreshing environment variables from registry for cmd.exe. Please wait..."
 
 goto main
 
@@ -52,5 +52,5 @@ goto main
     :: Set these variables
     call "%TEMP%\_env.cmd"
 
-    echo | set /p dummy="Done"
+    echo | set /p dummy="Finished."
     echo .