Merge branch 'stable'

* stable: (GH-7) install - unpacking log debut output (GH-78) Unpack self should use relative directory
chocolatey · Feb 8, 2015 · 6ab6f8d · 6ab6f8d
2 parents 4e180cf + 82d2760
commit 6ab6f8d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/nuget/chocolatey/tools/chocolateysetup.psm1 b/nuget/chocolatey/tools/chocolateysetup.psm1
@@ -4,6 +4,7 @@ $sysDrive = $env:SystemDrive
 $tempDir = $env:TEMP
 $defaultChocolateyPathOld = "$sysDrive\Chocolatey"
 $ErrorActionPreference = 'Stop'
+$debugMode = $false
 
 function Initialize-Chocolatey {
 <#
@@ -30,9 +31,16 @@ function Initialize-Chocolatey {
 param(
   [Parameter(Mandatory=$false)][string]$chocolateyPath = ''
 )
+  if ($env:ChocolateyEnvironmentDebug -ne $null) {
+    $debugMode = $true
+  }
 
   $chocoNew = Join-Path $thisScriptFolder 'chocolateyInstall\choco.exe'
-  & $chocoNew unpackself --force
+  if ($debugMode) {
+    & $chocoNew unpackself -fdv
+  } else {
+    & $chocoNew unpackself -f
+  }
 
   $installModule = Join-Path $thisScriptFolder 'chocolateyInstall\helpers\chocolateyInstaller.psm1'
   Import-Module $installModule -Force
@@ -200,7 +208,12 @@ param(
   $chocoExe = Join-Path $chocInstallFolder 'choco.exe'
   $chocoExeDest = Join-Path $chocolateyPath 'choco.exe'
   Copy-Item $chocoExe $chocoExeDest -force
- & $chocoExeDest unpackself --force
+
+  if ($debugMode) {
+    & $chocoExeDest unpackself -fdv
+  } else {
+    & $chocoExeDest unpackself -f
+  }
 }
 
 function Ensure-ChocolateyLibFiles {

diff --git a/src/chocolatey/infrastructure.app/commands/ChocolateyUnpackSelfCommand.cs b/src/chocolatey/infrastructure.app/commands/ChocolateyUnpackSelfCommand.cs
@@ -98,7 +98,7 @@ public void run(ChocolateyConfiguration configuration)
             AssemblyFileExtractor.extract_all_resources_to_relative_directory(
                 _fileSystem,
                 assembly,
-                ApplicationParameters.InstallLocation,
+                 _fileSystem.get_directory_name(Assembly.GetExecutingAssembly().Location),
                 folders,
                 ApplicationParameters.ChocolateyFileResources,
                 overwriteExisting: configuration.Force);

diff --git a/src/chocolatey/infrastructure/extractors/AssemblyFileExtractor.cs b/src/chocolatey/infrastructure/extractors/AssemblyFileExtractor.cs
@@ -100,6 +100,7 @@ public static void extract_all_resources_to_relative_directory(IFileSystem fileS
                 //var fileLocation = fileSystem.combine_paths("", resourceString.ToString().Split('.')) + resourceName.Substring(fileExtensionLocation);
 
                 var filePath = fileSystem.combine_paths(directoryPath, fileLocation);
+                "chocolatey".Log().Debug("Unpacking {0} to '{1}'".format_with(fileLocation,filePath));
                 extract_binary_file_from_assembly(fileSystem, assembly, resourceName, filePath, overwriteExisting);
             }
         }