Move shared app functions into Shared

Different directory structure for shared app functions from module private functions
aaronparker · Sep 20, 2023 · 86beb57 · 86beb57
1 parent ebc2e3a
commit 86beb57
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 6 deletions.
diff --git a/Evergreen/Evergreen.psm1 b/Evergreen/Evergreen.psm1
@@ -6,15 +6,17 @@
 param ()
 
 #region Get public and private function definition files
-$publicRoot = Join-Path -Path $PSScriptRoot -ChildPath "Public"
-$privateRoot = Join-Path -Path $PSScriptRoot -ChildPath "Private"
-$Public = @( Get-ChildItem -Path (Join-Path $publicRoot "*.ps1") -ErrorAction "SilentlyContinue" )
-$Private = @( Get-ChildItem -Path (Join-Path $privateRoot "*.ps1") -ErrorAction "SilentlyContinue" )
+$PublicRoot = Join-Path -Path $PSScriptRoot -ChildPath "Public"
+$PrivateRoot = Join-Path -Path $PSScriptRoot -ChildPath "Private"
+$SharedRoot = Join-Path -Path $PSScriptRoot -ChildPath "Shared"
+$Public = @( Get-ChildItem -Path (Join-Path -Path $PublicRoot -ChildPath "*.ps1") -ErrorAction "SilentlyContinue" )
+$Private = @( Get-ChildItem -Path (Join-Path -Path $PrivateRoot -ChildPath "*.ps1") -ErrorAction "SilentlyContinue" )
+$Shared = @( Get-ChildItem -Path (Join-Path -Path $SharedRoot -ChildPath "*.ps1") -ErrorAction "SilentlyContinue" )
 
 # Dot source the files
-foreach ($import in @($Public + $Private)) {
+foreach ($Import in @($Public + $Private + $Shared)) {
     try {
-        . $import.FullName
+        . $Import.FullName
     }
     catch {
         throw $_

diff --git a/Evergreen/Private/Get-AdoptiumTemurin.ps1 → Evergreen/Shared/Get-AdoptiumTemurin.ps1 b/Evergreen/Private/Get-AdoptiumTemurin.ps1 → Evergreen/Shared/Get-AdoptiumTemurin.ps1
diff --git a/...green/Private/Get-BellSoftLibericaJDK.ps1 → Evergreen/Shared/Get-BellSoftLibericaJDK.ps1 b/...green/Private/Get-BellSoftLibericaJDK.ps1 → Evergreen/Shared/Get-BellSoftLibericaJDK.ps1
diff --git a/Evergreen/Private/Get-GitHubRepoRelease.ps1 → Evergreen/Shared/Get-GitHubRepoRelease.ps1 b/Evergreen/Private/Get-GitHubRepoRelease.ps1 → Evergreen/Shared/Get-GitHubRepoRelease.ps1
diff --git a/Evergreen/Private/Get-JetBrainsApp.ps1 → Evergreen/Shared/Get-JetBrainsApp.ps1 b/Evergreen/Private/Get-JetBrainsApp.ps1 → Evergreen/Shared/Get-JetBrainsApp.ps1
diff --git a/Evergreen/Private/Get-OracleJava.ps1 → Evergreen/Shared/Get-OracleJava.ps1 b/Evergreen/Private/Get-OracleJava.ps1 → Evergreen/Shared/Get-OracleJava.ps1
diff --git a/...en/Private/Get-SourceForgeRepoRelease.ps1 → ...een/Shared/Get-SourceForgeRepoRelease.ps1 b/...en/Private/Get-SourceForgeRepoRelease.ps1 → ...een/Shared/Get-SourceForgeRepoRelease.ps1