Fix load module issue under PS7

diff --git a/files/Microsoft.PowerShell_profile.ps1 b/files/Microsoft.PowerShell_profile.ps1
index 3107b6a191442c57baef20c8029e0fbb2fec9db5..742accade523759989298bc29848e2fe7434a264 100644 (file)
--- a/files/Microsoft.PowerShell_profile.ps1
+++ b/files/Microsoft.PowerShell_profile.ps1
@@ -3,7 +3,6 @@ $env:dotfiles = "$HOME\dotfiles"
 Import-Module $env:dotfiles\psmodules\add_to_profile.psm1
 Add-ToProfile $env:dotfiles\files\paths.ps1
 Add-ToProfile $env:dotfiles\files\env.ps1
 Import-Module $env:dotfiles\psmodules\add_to_profile.psm1
 Add-ToProfile $env:dotfiles\files\paths.ps1
 Add-ToProfile $env:dotfiles\files\env.ps1

-Add-ToProfile $env:dotfiles\files\load_modules.ps1

 
 # Delay loading PoshGit for speed. 
 function Enable-PoshGit {
 
 # Delay loading PoshGit for speed. 
 function Enable-PoshGit {


@@ -23,5 +22,12 @@ Set-PSReadlineOption -EditMode Vi
 
 Write-Host "+ Type 'pg' to enable PoshGit"
 Write-Host 'See $env:realProfile for version controlled profile file.'
 
 Write-Host "+ Type 'pg' to enable PoshGit"
 Write-Host 'See $env:realProfile for version controlled profile file.'

+
+# Load some modules
+$env:psmodules = "$env:dotfiles\psmodules"
+Import-Module "$env:psmodules\dash.psm1"
+Import-Module $env:PSModules\file_management.psm1
+Import-Module "$env:psmodules\fix_vpn.psm1"
+

 # Let's face it, I'm about to cd into my source directory
 # Let's face it, I'm about to cd into my source directory

-if((Get-Location).Path -eq $HOME){ cd $env:src }
\ No newline at end of file
+if((Get-Location).Path -eq $HOME){ cd $env:src }

diff --git a/files/load_modules.ps1 b/files/load_modules.ps1
index 05ea057fcc5a4af9d771eb49b847a90ba95ef6e6..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/files/load_modules.ps1
+++ b/files/load_modules.ps1
@@ -1,5 +0,0 @@
-
-$env:psmodules = "$env:dotfiles\psmodules"
-Import-Module "$env:psmodules\dash.psm1"
-Import-Module $env:PSModules\file_management.psm1
-Import-Module "$env:psmodules\fix_vpn.psm1"
\ No newline at end of file