From: EdTheDev <edward@delaporte.us>
Date: Mon, 17 May 2021 03:52:19 +0000 (-0500)
Subject: Merge.
X-Git-Url: https://apps.delaporte.us/gitweb/dotfiles.git/commitdiff_plain/ff4bd2116c84600a2a5c981d06174eb792ff52a4?hp=-c

Merge.
---

ff4bd2116c84600a2a5c981d06174eb792ff52a4
diff --combined Microsoft.PowerShell_profile.ps1
index 355f90f,d62bca4..eed9141
--- a/Microsoft.PowerShell_profile.ps1
+++ b/Microsoft.PowerShell_profile.ps1
@@@ -9,7 -9,7 +9,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 "") {
+ if(-Not $IsWindows) {
   	# Bootstrap for older PowerShell
  	Write-Host "***Bootstrapped Is Windows for older PowerShell***"
   	$IsWindows = ($env:OS -eq "Windows_NT")
@@@ -26,7 -26,6 +26,7 @@@ if($IsWindows)
  	$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:\bin\x16emu" # Package management is nice.
  	$ENV:PATH+=";C:\PENGUIN" # Flag to ensure my profile kicked in.
  }
  
@@@ -78,15 -77,18 +78,26 @@@ function Enable-PoshGit 
  New-Alias pg    Enable-PoshGit
  Write-Host "+ Type 'pg' to enable PoshGit"
  
 +function Invoke-X16Emu {
 +	param(
 +		[string]$File
 +	)
 +	x16emu.exe -bas $File -keymap en-us
 +}
 +
 +New-Alias x16   Invoke-X16Emu
  
  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
diff --combined psmodules/drivespace.psm1
index 59feb96,361ee23..19fdc5e
--- a/psmodules/drivespace.psm1
+++ b/psmodules/drivespace.psm1
@@@ -21,6 -21,22 +21,21 @@@ function Show-Drivespace() 
  	}
  }
  
+ function Show-DrivespacePretty() {
+ 	Start-Job -Name "FileCollection" -ScriptBlock { Show-Drivespace }
+ While((Get-Job -Name "FileCollection").State -eq "Running") {
+ 	     Write-Progress -Activity "Collecting Files..." -PercentComplete $x
+ 	If($x -eq 100){
+ 		$x = 1
+ 	}
+ 	Else{
+ 		$x += 1
+ 	}
+ }
+ Write-Progress -Activity "Collecting Files..." -Completed
+ $Files = Get-Job -Name "FileCollection" | Receive-Job
+ Get-Job -Name "FileCollection" | Remove-Job
+ }
  
  Export-ModuleMember -Function Show-Drivespace 
 -Export-ModuleMember -Function Show-DrivespacePretty
  Export-ModuleMember -Function Show-LargeFiles