Skip to content

[WIP] Solve cross-platform import problem on MacOS build #910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

[WIP] Solve cross-platform import problem on MacOS build #910

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a1932e6
Fix module import path to work across platforms
stuartpreston Jan 2, 2023
daaecdf
Merge branch 'pesterv5'
stuartpreston Jan 2, 2023
c17c7e9
update paths so that they will work on MacOS
SQLDBAWithABeard Jan 2, 2023
812b596
Merge branch 'pesterv5' into pr/stuartpreston/910
SQLDBAWithABeard Jan 2, 2023
1699220
just to set off a PR build I hope
SQLDBAWithABeard Jan 2, 2023
d280c57
a commit that changes nothing
SQLDBAWithABeard Jan 2, 2023
d37b08f
this commit undoes the commit that does nothing and therefore does no…
SQLDBAWithABeard Jan 2, 2023
ba6e2a4
Merge branch 'dataplat:main' into main
stuartpreston Jan 2, 2023
cd3f4c2
because we need to import the file correctly
SQLDBAWithABeard Jan 3, 2023
8b74efd
More path fixes
stuartpreston Jan 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions source/dbachecks.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,7 @@ if ((Get-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\WindowsPowerShell\dbacheck
if ((Get-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\WindowsPowerShell\dbachecks\System" -Name "DoDotSource" -ErrorAction Ignore).DoDotSource) { $script:doDotSource = $true }

# Execute Preimport actions
if($IsLinux){
Write-Verbose "Loading preimport in linux"
. Import-ModuleFile -Path "$ModuleRoot/internal/scripts/preimport.ps1"
}else{
. Import-ModuleFile -Path "$ModuleRoot\internal\scripts\preimport.ps1"
}

. Import-ModuleFile -Path (Convert-Path -Path "$ModuleRoot\internal\scripts\preimport.ps1")

# Import all internal functions
foreach ($function in (Get-ChildItem "$ModuleRoot\internal\functions\*.ps1")) {
Expand All @@ -45,12 +39,7 @@ foreach ($function in (Get-ChildItem "$ModuleRoot\functions\*.ps1")) {
}

# Execute Postimport actions
if($IsLinux){
Write-Verbose "Loading postimport in linux"
. Import-ModuleFile -Path "$ModuleRoot/internal/scripts/postimport.ps1"
}else{
. Import-ModuleFile -Path "$ModuleRoot\internal\scripts\postimport.ps1"
}
. Import-ModuleFile -Path (Convert-Path -Path "$ModuleRoot\internal\scripts\postimport.ps1")

if (-not (Test-Path Alias:Update-Dbachecks)) { Set-Alias -Scope Global -Name 'Update-Dbachecks' -Value 'Update-DbcRequiredModules' }
$VerbosePreference = "SilentlyContinue"