shell

Author: stevencohn

Initialize-Machine.ps1

@@ -784,7 +784,7 @@ Process
 		return
 	}
 
-	if (!(Test-Path "$home\Documents\WindowsPowerShell\Modules\Scripts\"))
+	if (!(Test-Path "$home\Documents\$shell\Modules\Scripts\"))
 	{
 		Write-Host
 		WriteWarn '... Could not find $home\Documents\WindowsPowerShell scripts'

Install-Programs.ps1

@@ -35,7 +35,7 @@ Begin
 {
 	. $PSScriptRoot\common.ps1
 
-	$tools = 'C:\tools'
+	$script:tools = 'C:\tools'
 	$script:reminders = @(@())
 
 
@@ -190,7 +190,7 @@ Begin
 
 			$themes = "$env:ProgramFiles\notepad++\themes"
 			New-Item $themes -ItemType Directory -Force
-			Copy-Item "$home\Documents\WindowsPowerShell\Themes\Dark Selenitic npp.xml" "$themes\Dark Selenitic.xml"
+			Copy-Item "$home\Documents\$shell\Themes\Dark Selenitic npp.xml" "$themes\Dark Selenitic.xml"
 
 			# includes a dark-selenitic Markdown lang theme
 			$0 = "$($env:APPDATA)\Notepad++"

Microsoft.PowerShellISE_profile.ps1

@@ -2,7 +2,10 @@
 # Microsoft.PowerShell_profile.ps1                                                    22 Jun 2013
 #*************************************************************************************************
 
-$modules = Join-Path ([Environment]::GetFolderPath([Environment+SpecialFolder]::MyDocuments)) "WindowsPowerShell\Modules"
+$script:shell = 'PowerShell'
+if ($PSVersionTable.PSVersion.Major -lt 6) { $script:shell = 'WindowsPowerShell' }
+
+$modules = Join-Path ([Environment]::GetFolderPath([Environment+SpecialFolder]::MyDocuments)) "$shell\Modules"
 if (!$env:PSModulePath.Contains($modules)) { $env:PSModulePath = $modules + ";" + $env:PSModulePath }
 
 Import-Module -Global -Name Addons.psd1

Microsoft.VSCode_profile.ps1

@@ -1 +1,4 @@
-. $env:USERPROFILE\Documents\WindowsPowerShell\Microsoft.PowerShell_profile.ps1
+$script:shell = 'PowerShell'
+if ($PSVersionTable.PSVersion.Major -lt 6) { $script:shell = 'WindowsPowerShell' }
+
+. $env:USERPROFILE\Documents\$shell\Microsoft.PowerShell_profile.ps1

Modules/Addons/Open-Profile.psm1

@@ -5,8 +5,11 @@ Open the ISE profile definition script.
 
 function Open-Profile ()
 {
+    $shell = 'PowerShell'
+    if ($PSVersionTable.PSVersion.Major -lt 6) { $shell = 'WindowsPowerShell' }
+
     $path = Join-Path ([Environment]::GetFolderPath([Environment+SpecialFolder]::MyDocuments)) `
-        "WindowsPowerShell\Microsoft.PowerShellISE_profile.ps1"
+        "shell\Microsoft.PowerShellISE_profile.ps1"
 
     if (!(Test-Path($path)))
     {

Modules/Scripts/Repair-Path.ps1

@@ -169,9 +169,12 @@ Begin
 		$upaths = $usrPaths | % { ExpandPath $_ }
 
 		$ppaths = @()
+
+		$shell = 'PowerShell'
+		if ($PSVersionTable.PSVersion.Major -lt 6) { $shell = 'WindowsPowerShell' }
 
 		# PowerShell scripts are in path
-		$psroot = Join-Path $env:USERPROFILE 'Documents\WindowsPowerShell\Modules\Scripts'
+		$psroot = Join-Path $env:USERPROFILE "Documents\$shell\Modules\Scripts"
 
 		# preserve per-session (process) entries
 		$env:Path -split ';' | % `

Modules/Scripts/Set-OutDefaultOverride.ps1

@@ -2,6 +2,7 @@ New-CommandWrapper Out-Default -Process {
 	$nocase = [Text.RegularExpressions.RegexOptions]::IgnoreCase
 	$compressed = New-Object Text.RegularExpressions.Regex('\.(zip|tar|gz|iso)$', $nocase)
 	$executable = New-Object Text.RegularExpressions.Regex('\.(exe|bat|cmd|msi|ps1|psm1)$', $nocase)
+	$unix = New-Object Text.RegularExpressions.Regex('\.(sh)$', $nocase)
 
 	if (($_ -is [IO.DirectoryInfo]) -or ($_ -is [IO.FileInfo]))
 	{
@@ -53,6 +54,7 @@ New-CommandWrapper Out-Default -Process {
 		{
 			if ($compressed.IsMatch($name)) { $color = 'Magenta' }
 			elseif ($executable.IsMatch($name)) { $color = 'DarkGreen' }
+			elseif ($unix.IsMatch($name)) { $color = 'Cyan' }
 			else { $color = 'Gray' }
 
 			# ensure size fits within the 11 char column

common.ps1

@@ -4,6 +4,9 @@ Library of common functions shared by the Install-foo scripts.
 
 $proEdition = $null
 
+$script:shell = 'PowerShell'
+if ($PSVersionTable.PSVersion.Major -lt 6) { $script:shell = 'WindowsPowerShell' }
+
 
 function Chocolatize
 {

publish.ps1

@@ -1,5 +1,7 @@
 # Copy all scripts in this project to %userprofile%\Documents\WindowsPowerShell
 
-$docPath = Join-Path ([Environment]::GetFolderPath([Environment+SpecialFolder]::MyDocuments)) "WindowsPowerShell"
+. $PSScriptRoot\common.ps1
+
+$docPath = Join-Path ([Environment]::GetFolderPath([Environment+SpecialFolder]::MyDocuments)) $shell
 
 Copy-Item "$PSScriptRoot" "$docPath" -Recurse -Force -Exclude @("$this")