Skip to content

Commit

Permalink
Fix ModuleFast bootstrap script and update module version format
Browse files Browse the repository at this point in the history
  • Loading branch information
johlju committed Dec 23, 2023
1 parent 40384c3 commit 3dd1e89
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions Resolve-Dependency.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -206,22 +206,20 @@ if ($UseModuleFast -and $UsePSResourceGet)
}
}

if ($UseModuleFast)
if ($UseModuleFast -and -not (Get-Module -Name 'ModuleFast'))
{
try
{
$moduleFastBootstrapScriptBlockParameters = @{}

if ($ModuleFastBleedingEdge)
{
$moduleFastBootstrapUri = 'bit.ly/modulefastmain' # cSpell: disable-line
Write-Information -MessageData 'ModuleFast is configured to use Bleeding Edge (directly from ModuleFast''s main branch).' -InformationAction 'Continue'

$moduleFastBootstrapScriptBlockParameters.UseMain = $true
}
else
{
$moduleFastBootstrapUri = 'bit.ly/modulefast' # cSpell: disable-line
}

$moduleFastBootstrapUri = 'bit.ly/modulefastmain' # cSpell: disable-line

Write-Debug -Message ('Using bootstrap script at {0}' -f $moduleFastBootstrapUri)

Expand Down Expand Up @@ -810,7 +808,7 @@ try
}
else
{
$modulesToSave += ('{0}[{1}]' -f $requiredModule.Name, $requiredModuleVersion)
$modulesToSave += ('{0}:[{1}]' -f $requiredModule.Name, $requiredModuleVersion)
}
}
else
Expand All @@ -829,7 +827,7 @@ try
else
{
# Assuming the version is a fixed version.
$modulesToSave += ('{0}[{1}]' -f $requiredModule.Name, $requiredModule.Value)
$modulesToSave += ('{0}:[{1}]' -f $requiredModule.Name, $requiredModule.Value)
}
}
}
Expand Down

0 comments on commit 3dd1e89

Please sign in to comment.