Tweak for Win vs Pi

[dotfiles.git] / Microsoft.PowerShell_profile.ps1

diff --git a/Microsoft.PowerShell_profile.ps1 b/Microsoft.PowerShell_profile.ps1
index 8b3442fab32afd904615f909d1ca5e3525223af3..7f228624c3a2529febeeda966821165986b1e19f 100644 (file)
--- a/Microsoft.PowerShell_profile.ps1
+++ b/Microsoft.PowerShell_profile.ps1
@@ -8,10 +8,11 @@
 #}
 # $env:PSModulePath = $env:PSModulePath.Replace("\\ad.uillinois.edu\techsvc\home\$($ENV:USERNAME)\Documents\PowerShell\Modules;",'')
 
-if($IsWindows -eq "") {
-       # Bootstrap for older PowerShell
-       $IsWindows = ($env:OS -eq "Windows_NT")
-}
+# 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
@@ -21,21 +22,27 @@ if($IsWindows -eq "") {
 #      $ENV:PATH+=";C:\PENGUIN" # Flag to ensure my profile kicked in.
 #}
 
-# Import some home grown PowerShell modules, if they are installed.
+$env:Journal = "~\Journal\2021" # allows cd $env:journal
+
+$src = "~"
+if($IsWindows){
+  $src = "c:\src"
+}
 
-$modPaths = Get-Childitem -Path "c:\src\dotfiles\psmodules"
+# Import some home grown PowerShell modules, if they are installed.
+#
+$modPaths = Get-Childitem -Path "$src\dotfiles\psmodules"
+$modPaths += Get-Childitem -Path "$src\minion\psmodule"
 if($modPaths.length -eq 0){
        Write-Host "No modules found."
 }
 $modPaths | ForEach-Object {
-#    $_ | Format-Table
-  if(Test-Path -Path $_) {
-    Import-Module $_
-    Write-Host ">> Loaded $_"
-       }
+       $fileName = $_.FullName
+       Import-Module $fileName
+       Write-Host ">> Loaded $fileName"
 }
-#}
-# $env:PSModulePath = $env:PSModulePath + ";c:\src\dotfiles\psmodules"
+
+# $env:PSModulePath = $env:PSModulePath + ";$src\dotfiles\psmodules"
 
 
 # Linux-like up/down in shell
@@ -43,8 +50,11 @@ Set-PSReadlineKeyHandler -Key UpArrow -Function HistorySearchBackward
 Set-PSReadlineKeyHandler -Key DownArrow -Function HistorySearchForward 
 Set-PSReadlineOption -HistorySavePath c:\temp\PSHistory.log
 
-# Minion commands - 'today'
-. C:\src\minion\profiles\alias.ps1
+# Minion alias commands - 'today'
+. $src\minion\profiles\alias.ps1
+# Add Minion to path
+Write-Host "+ Added minion command to path."
+$ENV:PATH+=";$src\minion\go" # Flag to ensure my profile kicked in.
 
 # Unix dies hard.
 New-Alias which get-command
@@ -56,5 +66,7 @@ function Enable-PoshGit {
 New-Alias pg    Enable-PoshGit
 Write-Host "+ Type 'pg' to enable PoshGit"
 
-# cd c:\src
-#
+
+if((Get-Location).Path -eq $HOME){
+       cd $src
+}