Fix for rm command

[dotfiles.git] / Microsoft.PowerShell_profile.ps1

diff --git a/Microsoft.PowerShell_profile.ps1 b/Microsoft.PowerShell_profile.ps1
index 7a8369632609afdc3a8758979bfd629c4702dd10..45ca75a2712e6620e533d5f2c1c5b0036ab87ca7 100644 (file)
--- a/Microsoft.PowerShell_profile.ps1
+++ b/Microsoft.PowerShell_profile.ps1
@@ -8,40 +8,65 @@
 #}
 # $env:PSModulePath = $env:PSModulePath.Replace("\\ad.uillinois.edu\techsvc\home\$($ENV:USERNAME)\Documents\PowerShell\Modules;",'')
 
 #}
 # $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(-Not $IsWindows) {
+       # Bootstrap for older PowerShell
+       Write-Host "***Bootstrapped Is Windows for older PowerShell***"
+       $IsWindows = ($env:OS -eq "Windows_NT")
+}
+
+$env:src = "~"
+if($IsWindows){
+       Write-Host "***Is Windows***"
+  $env:src = "c:\src"
+}
+
+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:\Program Files (x86)\GnuWin32\bin" # GNU Utils - i.e. rm
+       $ENV:PATH+=";C:\PENGUIN" # Flag to ensure my profile kicked in.

 }
 
 }
 

-#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.
-#}
+
+$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 "$env:src\dotfiles\psmodules"
+$modPaths += Get-Childitem -Path "$env:minion\psmodule"

 
 

-$modPaths = Get-Childitem -Path "c:\src\dotfiles\psmodules"
+# Windows Only Modules
+if($IsWindows){
+       $modPaths += Get-Childitem -Path "$env:src\dotfiles\win_psmodules"
+}
+if($modPaths.length -eq 0){
+       Write-Host "No modules found."
+}

 $modPaths | ForEach-Object {
 $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"
+

 
 
 # 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 c:\temp\PSHistory.log
+Set-PSReadlineOption -HistorySavePath $env:src\PSHistory.log

 
 

-# Minion commands - 'today'
-. C:\src\minion\profiles\alias.ps1
+# Minion alias commands - 'today'
+# . 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."
+$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


@@ -53,5 +78,18 @@ function Enable-PoshGit {
 New-Alias pg    Enable-PoshGit
 Write-Host "+ Type 'pg' to enable PoshGit"
 
 New-Alias pg    Enable-PoshGit
 Write-Host "+ Type 'pg' to enable PoshGit"
 

-# cd c:\src
-#
+
+if((Get-Location).Path -eq $HOME){
+       cd $env:src
+}
+
+function Get-GitLog() {
+       git log --oneline
+}
+
+function Get-GitStatus() {
+       git status -b --short
+}
+
+New-Alias ol           Get-GitLog
+New-Alias st           Get-GitStatus