Rework installation to go to Common Files.

Also added logic to add the custom module location to the PSModulePath.
On uninstall, the path entry is removed iff the module location ends up as
being empty after we remove our module. This makes us play nice with other
packages that want to also install in this Common Files location.

Author: cbadke

ChocolateyPackage/tools/Install-Module.ps1

@@ -0,0 +1,41 @@
+param(
+        [Parameter(Mandatory=$TRUE)]
+        [String] $PathToModuleFiles,
+        [Parameter(Mandatory=$TRUE)]
+        [String] $ModuleName
+     )
+
+if (!(Test-Path -PathType Container $PathToModuleFiles)) {
+    Write-Error "$PathToModuleFiles not found or is not a directory. Nothing to install."
+    exit
+}
+
+$moduleRoot = "$($env:CommonProgramW6432)\Modules\"
+$dest = "$moduleRoot\$ModuleName\"
+
+if (!(Test-Path $moduleRoot)) {
+    New-Item -ItemType directory $moduleRoot | out-null
+}
+
+Write-Host -NoNewLine "Copying $ModuleName module to $moduleRoot... "
+
+Copy-Item -Force -Recurse $PathToModuleFiles $dest
+
+Write-Host -ForegroundColor Green "done"
+
+#Update PSModulePath if it needs it
+$path = [Environment]::GetEnvironmentVariable("PSModulePath")
+
+$pathContainsRoot = 0 -ne ($path.Split(';') | ? { Test-Path $_ } | ? { (Resolve-Path $_).Path -eq (Resolve-Path $moduleRoot).Path}).count
+
+if(-Not $pathContainsRoot) {
+
+    Write-Host -NoNewLine "Adding $moduleRoot to `$env:PSModulePath... "
+
+    $path += ";$moduleRoot"
+    [Environment]::SetEnvironmentVariable("PSModulePath", $path, "Machine")
+
+    Write-Host -ForegroundColor Green "done"
+}
+
+Write-Host "Installation complete."

ChocolateyPackage/tools/Remove-Module.ps1

@@ -0,0 +1,47 @@
+param(
+    [Parameter(Mandatory=$TRUE)]
+    [String] $ModuleName
+)
+
+    $moduleRoot = "$($env:CommonProgramW6432)\Modules\"
+    $dir = "$moduleRoot\$ModuleName\"
+
+    if (Test-Path $dir) {
+        Write-Host -NoNewLine "Removing $ModuleName module from $moduleRoot... "
+
+        Remove-Item -Recurse -Force $dir
+
+        Write-Host -ForegroundColor Green "done"
+    }
+
+    if (Test-Path $moduleRoot) {
+        if (!(Get-ChildItem -Recurse -Force $moduleRoot)) {
+            Write-Host "Module directory empty."
+
+            Write-Host -NoNewLine "Removing module directory from `$env:PSModulePath... "
+
+            $path = [Environment]::GetEnvironmentVariable("PSModulePath")
+
+            #Remove match paths but be careful about handling paths that don't
+            #exist. We don't want to accidentally remove a path that we didn't
+            #add.
+            $cleanedPath = $path.Split(';') | 
+                            Where-Object { 
+                                    (-Not (Test-Path $_ )) -or
+                                    ((Resolve-Path $_).Path -ne (Resolve-Path $moduleRoot).Path) } |
+                            Select-Object -Unique
+            $cleanedPath = $cleanedPath -Join ';'
+
+            [Environment]::SetEnvironmentVariable("PSModulePath", $cleanedPath, "Machine")
+
+            Write-Host -ForegroundColor Green "done"
+
+
+            Write-Host -NoNewLine "Removing empty module directory... "
+            Remove-Item $moduleRoot
+            Write-Host -ForegroundColor Green "done"
+
+        }
+
+        Write-Host "Removal complete."
+    }

ChocolateyPackage/tools/chocolateyinstall.ps1

@@ -2,20 +2,9 @@ $packageName = "PSReadLine"
 
 try {
   $source = Resolve-Path ($PSScriptRoot + "\..\$packageName\")
-  $dest64 = "C:\Windows\system32\WindowsPowerShell\v1.0\Modules\"
-  $dest32 = "C:\Windows\sysWOW64\WindowsPowerShell\v1.0\Modules\"
 
-  $command = ""
+  Start-ChocolateyProcessAsAdmin "$PSScriptRoot\Install-Module.ps1 '$source' '$packageName'"
 
-  if (Test-Path -PathType Container $dest64) {
-      $command = $command + "Copy-Item -Force -Recurse `'$source`' `'$dest64`';"
-  }
-
-  if (Test-Path -PathType Container $dest32) {
-      $command = $command + "Copy-Item -Force -Recurse `'$source`' `'$dest32`'"
-  }
-
-  Start-ChocolateyProcessAsAdmin $command
 
   Write-ChocolateySuccess $packageName
 } catch {

ChocolateyPackage/tools/chocolateyuninstall.ps1

@@ -1,20 +1,8 @@
 $packageName = "PSReadLine"
 
 try {
-  $dir64 = "C:\Windows\system32\WindowsPowerShell\v1.0\Modules\$packageName\"
-  $dir32 = "C:\Windows\sysWOW64\WindowsPowerShell\v1.0\Modules\$packageName\"
 
-  $command = ""
-
-  if (Test-Path -PathType Container $dir64) {
-      $command = $command + "Remove-Item -Recurse -Force `'$dir64`';"
-  }
-
-  if (Test-Path -PathType Container $dir32) {
-      $command = $command + "Remove-Item -Recurse -Force `'$dir32`'"
-  }
-
-  Start-ChocolateyProcessAsAdmin $command
+  Start-ChocolateyProcessAsAdmin "$PSScriptRoot\Remove-Module.ps1 '$packageName'"
 
   Write-ChocolateySuccess $packageName
 } catch {