Merging cross platform changes.

[dotfiles.git] / Microsoft.PowerShell_profile.ps1

diff --git a/Microsoft.PowerShell_profile.ps1 b/Microsoft.PowerShell_profile.ps1
index 69c720db7e05947acaea66e78cbc1bc0e3bb9d93..31b22adbe57c2933bba0eeddd55db97262959930 100644 (file)
--- a/Microsoft.PowerShell_profile.ps1
+++ b/Microsoft.PowerShell_profile.ps1
@@ -9,32 +9,38 @@
 # $env:PSModulePath = $env:PSModulePath.Replace("\\ad.uillinois.edu\techsvc\home\$($ENV:USERNAME)\Documents\PowerShell\Modules;",'')
 
 # No longer needed in PowerShell 7
 # $env:PSModulePath = $env:PSModulePath.Replace("\\ad.uillinois.edu\techsvc\home\$($ENV:USERNAME)\Documents\PowerShell\Modules;",'')
 
 # No longer needed in PowerShell 7

-# if($IsWindows -eq "") {
-#      # Bootstrap for older PowerShell
-#      $IsWindows = ($env:OS -eq "Windows_NT")
-# }
-
-#if($IsWindows){
-#      # Some Paths that are annoying to find/restore if the installer fails
-#      $ENV:PATH+=";C:\Program Files\Microsoft VS Code\bin" # One Editor to rule them all
-#      $ENV:PATH+=";C:\Program Files\Git\cmd" # Version control is nice.
-#      $ENV:PATH+=";C:\ProgramData\chocolatey\bin" # Package management is nice.
-#      $ENV:PATH+=";C:\PENGUIN" # Flag to ensure my profile kicked in.
-#}
+if($IsWindows -eq "") {
+       # Bootstrap for older PowerShell
+       Write-Host "***Bootstrapped Is Windows for older PowerShell***"
+       $IsWindows = ($env:OS -eq "Windows_NT")
+}

 
 

-$env:Journal = "~\Journal\2021" # allows cd $env:journal
+$env:src = "~"
+if($IsWindows){
+       Write-Host "***Is Windows***"
+  $env:src = "c:\src"
+}

 
 

-$src = "~"

 if($IsWindows){
 if($IsWindows){

-  $src = "c:\src"
+       # Some Paths that are annoying to find/restore if the installer fails
+       $ENV:PATH+=";C:\Program Files\Microsoft VS Code\bin" # One Editor to rule them all
+       $ENV:PATH+=";C:\Program Files\Git\cmd" # Version control is nice.
+       $ENV:PATH+=";C:\ProgramData\chocolatey\bin" # Package management is nice.
+       $ENV:PATH+=";C:\PENGUIN" # Flag to ensure my profile kicked in.

 }
 
 }
 

+
+$env:Journal = "~\Journal\2021" # allows cd $env:journal
+$env:minion = "$env:src\minion"
+

 # Import some home grown PowerShell modules, if they are installed.
 #
 # Import some home grown PowerShell modules, if they are installed.
 #

-$modPaths = Get-Childitem -Path "$src\dotfiles\psmodules"
-$modPaths += Get-Childitem -Path "$src\minion\psmodule"
+$modPaths = Get-Childitem -Path "$env:src\dotfiles\psmodules"
+$modPaths += Get-Childitem -Path "$env:minion\psmodule"
+
+# Windows Only Modules

 if($IsWindows){
 if($IsWindows){

-       $modPaths += Get-Childitem -Path "$src\dotfiles\win_psmodules"
+       $modPaths += Get-Childitem -Path "$env:src\dotfiles\win_psmodules"

 }
 if($modPaths.length -eq 0){
        Write-Host "No modules found."
 }
 if($modPaths.length -eq 0){
        Write-Host "No modules found."


@@ -45,21 +51,21 @@ $modPaths | ForEach-Object {
        Write-Host ">> Loaded $fileName"
 }
 
        Write-Host ">> Loaded $fileName"
 }
 

-# $env:PSModulePath = $env:PSModulePath + ";$src\dotfiles\psmodules"
-
-# Windows Only Modules

 
 
 # Linux-like up/down in shell
 Set-PSReadlineKeyHandler -Key UpArrow -Function HistorySearchBackward 
 Set-PSReadlineKeyHandler -Key DownArrow -Function HistorySearchForward 
 
 
 # Linux-like up/down in shell
 Set-PSReadlineKeyHandler -Key UpArrow -Function HistorySearchBackward 
 Set-PSReadlineKeyHandler -Key DownArrow -Function HistorySearchForward 

-Set-PSReadlineOption -HistorySavePath $src\PSHistory.log
+Set-PSReadlineOption -HistorySavePath $env:src\PSHistory.log

 
 # Minion alias commands - 'today'
 
 # Minion alias commands - 'today'

-. $src\minion\profiles\alias.ps1
+# . C:\src\minion\profiles\alias.ps1
+. $env:minion\profiles\alias.ps1
+# Add Minion go executable to path.
+. $env:minion\profiles\path.ps1

 # Add Minion to path
 Write-Host "+ Added minion command to path."
 # Add Minion to path
 Write-Host "+ Added minion command to path."

-$ENV:PATH+=";$src\minion\go" # Flag to ensure my profile kicked in.
+$ENV:PATH+=";$env:minion\go" # Flag to ensure my profile kicked in.

 
 # Unix dies hard.
 New-Alias which get-command
 
 # Unix dies hard.
 New-Alias which get-command


@@ -73,5 +79,5 @@ Write-Host "+ Type 'pg' to enable PoshGit"
 
 
 if((Get-Location).Path -eq $HOME){
 
 
 if((Get-Location).Path -eq $HOME){

-       cd $src
+       cd $env:src

 }
 }