Merge branch 'stable'

* stable:
  (chocolatey-archiveGH-460) Fix for "Package depending on newer chocolatey is installed using existing chocolatey"
  (chocolatey-archiveGH-459) Fix for "Cannot find Update-SessionInformation"
  (maint) formatting
  (chocolatey-archiveGH-153)(chocolatey-archiveGH-134) Update PATH on cmd.exe
  (maint) ensure powershell module loading preference is on

nuget/tools/chocolateyInstall.ps1

@@ -1,5 +1,8 @@
 $toolsPath = (Split-Path -parent $MyInvocation.MyCommand.Definition)
 
+# ensure module loading preference is on
+$PSModuleAutoLoadingPreference = "All";
+
 $modules = Get-ChildItem $toolsPath -Filter *.psm1
 $modules | ForEach-Object {
 														$psm1File = $_.FullName;

nuget/tools/chocolateysetup.psm1

@@ -29,7 +29,7 @@ param(
 )
 
   $installModule = Join-Path $thisScriptFolder 'chocolateyInstall\helpers\chocolateyInstaller.psm1'
-  Import-Module $installModule
+  Import-Module $installModule -Force
 
   if ($chocolateyPath -eq '') {
     $programData = [Environment]::GetFolderPath("CommonApplicationData")
@@ -73,7 +73,8 @@ Creating Chocolatey NuGet folders if they do not already exist.
   Initialize-ChocolateyPath $chocolateyExePath $chocolateyExePathVariable
   Process-ChocolateyBinFiles $chocolateyExePath $chocolateyExePathVariable
   Install-DotNet4IfMissing $chocolateyInstallPath
-  Remove-Module ChocolateyInstaller
+  $realModule = Join-Path $chocolateyInstallPath "helpers\chocolateyInstaller.psm1"
+  Import-Module "$realModule" -Force
 
 @"
 Chocolatey is now ready.
@@ -113,7 +114,7 @@ param(
 )
 
   $redirectsPath = Join-Path $chocolateyInstallPath 'redirects'
-  $exeFiles = Get-ChildItem "$redirectsPath" -filter *.exe
+  $exeFiles = Get-ChildItem "$redirectsPath" -include @("*.exe","*.cmd") -recurse
   foreach ($exeFile in $exeFiles) {
     $exeFilePath = $exeFile.FullName
     $exeFileName = [System.IO.Path]::GetFileName("$exeFilePath")

src/chocolatey.cmd

@@ -15,7 +15,6 @@ IF NOT '%1'=='' SET PS_ARGS=%PS_ARGS:\\"=\"%
 
 @PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%DIR%chocolatey.ps1' %PS_ARGS%"
 SET ErrLvl=%ERRORLEVEL%
-call "%DIR%RefreshEnv.cmd"
 goto :exit
 
 :exit

src/chocolatey.ps1

@@ -71,6 +71,8 @@ if ($debug) {
   $DebugPreference = "Continue";
   $env:ChocolateyEnvironmentDebug = 'true'
 }
+# ensure module loading preference is on
+$PSModuleAutoLoadingPreference = "All";
 
 $installModule = Join-Path $nugetChocolateyPath (Join-Path 'helpers' 'chocolateyInstaller.psm1')
 Import-Module $installModule

src/functions/Chocolatey-NuGet.ps1

@@ -99,6 +99,6 @@ Write-Debug "Installing packages to `"$nugetLibPath`"."
     }
   }
 
- Update-SessionEnvironment
- Write-Host "Finished installing `'$packageName`' and dependencies - if errors not shown in console, none detected. Check log for errors if unsure." -ForegroundColor $RunNote -BackgroundColor Black
+  Update-SessionEnvironment
+  Write-Host "Finished installing `'$packageName`' and dependencies - if errors not shown in console, none detected. Check log for errors if unsure." -ForegroundColor $RunNote -BackgroundColor Black
 }

src/helpers/functions/Update-SessionEnvironment.ps1

@@ -1,20 +1,20 @@
 function Update-SessionEnvironment {
 <#
 .SYNOPSIS
-Updates the environment variables of the current powershell session with 
-any environment variable changes that may have occured during a chocolatey 
+Updates the environment variables of the current powershell session with
+any environment variable changes that may have occured during a chocolatey
 package install.
 
 .DESCRIPTION
-When chocolatey installs a package, the package author may ad or change 
-certain environment variables that will affect how the application runs 
-or how it is accessed. Often, these changes are not visible to the current 
-powershell session. This means the user needs to open a new powershell 
-session before these settings take effect which can render the installed 
+When chocolatey installs a package, the package author may add or change
+certain environment variables that will affect how the application runs
+or how it is accessed. Often, these changes are not visible to the current
+powershell session. This means the user needs to open a new powershell
+session before these settings take effect which can render the installed
 application unfunctional until that time.
 
-Use the Update-SessionEnvironment command to refresh the current 
-powershell session with all environment settings possibly performed by 
+Use the Update-SessionEnvironment command to refresh the current
+powershell session with all environment settings possibly performed by
 chocolatey package installs.
 
 #>

src/RefreshEnv.cmd → src/redirects/RefreshEnv.cmd

@@ -7,17 +7,16 @@
 ::
 :: With this batch file, there should be no need to reload command
 :: environment every time you want environment changes to propagate
-::
 
-:: A strange trick to print without newline
-:: echo | set /p dummy="Reading environment variables from registry. Please wait... "
+echo | set /p dummy="Reading environment variables from registry. Please wait... "
+
 goto main
 
 :: Set one environment variable from registry key
 :SetFromReg
     "%WinDir%\System32\Reg" QUERY "%~1" /v "%~2" > "%TEMP%\_envset.tmp" 2>NUL
     for /f "usebackq skip=2 tokens=2,*" %%A IN ("%TEMP%\_envset.tmp") do (
-        echo/set "%~3=%%B"
+        echo/set %~3=%%B
     )
     goto :EOF
 
@@ -43,11 +42,7 @@ goto main
     call :SetFromReg "HKCU\Environment" Path Path_HKCU >> "%TEMP%\_env.cmd"
 
     :: Caution: do not insert space-chars before >> redirection sign
-    echo/set "Path=%%Path_HKLM%%;%%Path_HKCU%%" >> "%TEMP%\_env.cmd"
-
-    :: In final file: remove temp variables
-    echo/set "Path_HKLM=" >> "%TEMP%\_env.cmd"
-    echo/set "Path_HKCU=" >> "%TEMP%\_env.cmd"
+    echo/set Path=%%Path_HKLM%%;%%Path_HKCU%% >> "%TEMP%\_env.cmd"
 
     :: Cleanup
     del /f /q "%TEMP%\_envset.tmp" 2>nul
@@ -56,9 +51,5 @@ goto main
     :: Set these variables
     call "%TEMP%\_env.cmd"
 
-    :: Finish
-  ::  echo | set /p dummy="Done"
-    ::echo .
-
-
-exit /b %ERRORLEVEL%
+    echo | set /p dummy="Done"
+    echo .