fix: Rename files in proper order and don't replace tokens in initialization script

deadlydog · deadlydog · commit 4191b070d8b3 · 2024-02-25T22:19:08.000-06:00
diff --git a/_InitializeRepository.ps1 b/_InitializeRepository.ps1
@@ -66,11 +66,6 @@ Begin
 		[string] $moduleManifestFilePath = "$moduleDirectoryPath\__NewModuleName__.psd1"
 		[string] $moduleTestsFilePath = "$moduleDirectoryPath\__NewModuleName__.Tests.ps1"
 
-		if (Test-Path -Path $moduleDirectoryPath -PathType Container)
-		{
-			Rename-Item -Path $moduleDirectoryPath -NewName $moduleName -Force
-		}
-
 		if (Test-Path -Path $moduleFilePath -PathType Leaf)
 		{
 			Rename-Item -Path $moduleFilePath -NewName "$moduleName.psm1" -Force
@@ -85,11 +80,17 @@ Begin
 		{
 			Rename-Item -Path $moduleTestsFilePath -NewName "$moduleName.Tests.ps1" -Force
 		}
+
+		# Rename the directory last.
+		if (Test-Path -Path $moduleDirectoryPath -PathType Container)
+		{
+			Rename-Item -Path $moduleDirectoryPath -NewName $moduleName -Force
+		}
 	}
 
 	function Set-TemplateTokenValuesInAllRepoFiles([string] $moduleName, [string] $organizationName)
 	{
-		$repositoryFiles = Get-ChildItem -Path $RepositoryRoot -Recurse -File
+		$repositoryFiles = Get-ChildItem -Path $RepositoryRoot -Recurse -File -Exclude '_InitializeRepository.ps1'
 		foreach ($file in $repositoryFiles)
 		{
 			$filePath = $file.FullName

Original file line number	Diff line number	Diff line change
`@@ -66,11 +66,6 @@ Begin`
`66`	`66`	`[string] $moduleManifestFilePath = "$moduleDirectoryPath\__NewModuleName__.psd1"`
`67`	`67`	`[string] $moduleTestsFilePath = "$moduleDirectoryPath\__NewModuleName__.Tests.ps1"`
`68`	`68`
`69`		`- if (Test-Path -Path $moduleDirectoryPath -PathType Container)`
`70`		`- {`
`71`		`- Rename-Item -Path $moduleDirectoryPath -NewName $moduleName -Force`
`72`		`- }`
`73`		`-`
`74`	`69`	`if (Test-Path -Path $moduleFilePath -PathType Leaf)`
`75`	`70`	`{`
`76`	`71`	`Rename-Item -Path $moduleFilePath -NewName "$moduleName.psm1" -Force`
`@@ -85,11 +80,17 @@ Begin`
`85`	`80`	`{`
`86`	`81`	`Rename-Item -Path $moduleTestsFilePath -NewName "$moduleName.Tests.ps1" -Force`
`87`	`82`	`}`
	`83`	`+`
	`84`	`+ # Rename the directory last.`
	`85`	`+ if (Test-Path -Path $moduleDirectoryPath -PathType Container)`
	`86`	`+ {`
	`87`	`+ Rename-Item -Path $moduleDirectoryPath -NewName $moduleName -Force`
	`88`	`+ }`
`88`	`89`	`}`
`89`	`90`
`90`	`91`	`function Set-TemplateTokenValuesInAllRepoFiles([string] $moduleName, [string] $organizationName)`
`91`	`92`	`{`
`92`		`- $repositoryFiles = Get-ChildItem -Path $RepositoryRoot -Recurse -File`
	`93`	`+ $repositoryFiles = Get-ChildItem -Path $RepositoryRoot -Recurse -File -Exclude '_InitializeRepository.ps1'`
`93`	`94`	`foreach ($file in $repositoryFiles)`
`94`	`95`	`{`
`95`	`96`	`$filePath = $file.FullName`