From: EdTheDev <edward@delaporte.us>
Date: Sun, 9 Jan 2022 22:16:59 +0000 (-0600)
Subject: Merge branch 'main' of github.com:edthedev/dotfiles into main
X-Git-Url: https://apps.delaporte.us/gitweb/dotfiles.git/commitdiff_plain/d3c5ebcbb561f35bc0b129913024ce05fae6c14a?hp=-c

Merge branch 'main' of github.com:edthedev/dotfiles into main
---

d3c5ebcbb561f35bc0b129913024ce05fae6c14a
diff --combined Microsoft.PowerShell_profile.ps1
index 109783a,f6ee52f..6a1ab94
--- a/Microsoft.PowerShell_profile.ps1
+++ b/Microsoft.PowerShell_profile.ps1
@@@ -15,7 -15,7 +15,7 @@@ if(-Not $IsWindows) 
   	$IsWindows = ($env:OS -eq "Windows_NT")
  }
  
 -$env:src = "~"
 +$env:src = "~\src"
  if($IsWindows){
  	Write-Host "***Is Windows***"
    $env:src = "c:\src"
@@@ -29,8 -29,6 +29,8 @@@ if($IsWindows)
  	$ENV:PATH+=";C:\bin\x16emu" # 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.
 +	$ENV:PATH+=";$env:src\x16-demo\tools" # x16 python tools
 +	$ENV:PATH+=";$env:src\chart" # command line chart utility edthedev\chart
  }
  else {
  	$ENV:PATH+=":$HOME/x16/x16-emulator" # x16 Emulator
@@@ -46,6 -44,9 +46,9 @@@ $env:minion = "$env:src\minion
  $modPaths = Get-Childitem -Path "$env:src\dotfiles\psmodules"
  $modPaths += Get-Childitem -Path "$env:minion\psmodule"
  
+ # https://github.com/uillinois-community/powershell-scripts
+ $modPaths += Get-Childitem -Path "$env:src\powershell-scripts\modules"
+ 
  # Windows Only Modules
  if($IsWindows){
  	$modPaths += Get-Childitem -Path "$env:src\dotfiles\win_psmodules"
@@@ -55,8 -56,10 +58,10 @@@ if($modPaths.length -eq 0)
  }
  $modPaths | ForEach-Object {
  	$fileName = $_.FullName
- 	Import-Module $fileName
- 	Write-Host ">> Loaded $fileName"
+ 	if($filename -Like "*.psm1") {
+ 		Import-Module $fileName
+ 		Write-Host ">> Loaded $fileName"
+ 	}
  }
  
  
@@@ -108,6 -111,18 +113,18 @@@ function Get-GitStatus() 
  	git status -b --short
  }
  
+ # Tell my scripts which GitHub repositories to look in.
+ $env:GITHUB_USERNAME = 'edthedev'
+ $env:GITHUB_ORG = 'techservicesillinois'
+ $env:GITHUB_ORGS = @('techservicesillinois', 'uillinois-community')
+ $env:GITHUB_REPOS = @(
+ 	'techservicesillinois/SecOps-Tools', 
+ 	'techservicesillinois/secdev-job-aids', 
+ 	'techservicesillinois/awscli-login', 
+ 	'techservicesillinois/farmit',
+ 	'uillinois-community/uillinois-community.github.io'
+ )
+ 
  # Nice for git
  New-Alias ol 		Get-GitLog
  New-Alias st 		Get-GitStatus