Fiddling with paths

Author: DecimalTurn

Main.ps1

@@ -86,17 +86,22 @@ Write-TimedMessage "Minimizing Administrator window" -StartNewStep
 Minimize-Window "Administrator: C:\actions"
 Write-TimedMessage "Window minimized"
 
-
+$originalSrcDir = $srcDir
 
 foreach ($folder in $folders) {
+    Write-Host "========================="
+    # Reset the source directory to the original value
+    $srcDir = $originalSrcDir
+
     Write-TimedMessage "Processing folder: $folder" -StartNewStep
     $fileExtension = $folder.Substring($folder.LastIndexOf('.') + 1)
+    Write-Host "File extension: $fileExtension"
     $app = Get-OfficeApp -FileExtension $fileExtension
 
     $ext = ""
     if ($app -ne "Access") {
         $ext = "zip"
-        Write-TimedMessage "Creating Zip file and renaming to Office document target" -StartNewStep
+        Write-TimedMessage "Creating Zip file and renaming to Office document target with path ${srcDir}${folder}" -StartNewStep
         . "$PSScriptRoot/scripts/Zip-It.ps1" "${srcDir}${folder}"
         Write-TimedMessage "Zip file created"
     }
@@ -116,6 +121,8 @@ foreach ($folder in $folders) {
     $buildVbaScriptPath = "$PSScriptRoot/scripts/Build-VBA.ps1"
     $success = Invoke-ScriptWithTimeout -ScriptPath $buildVbaScriptPath -Arguments @("${srcDir}${folder}", "$app") -TimeoutSeconds 30
 
+    Write-Host "srcDir: ${srcDir}"
+
     if (-not $success) {
         Write-TimedMessage "🔴 Build-VBA.ps1 execution timed out or failed for ${folder}. Continuing with next file..."
 
@@ -129,5 +136,4 @@ foreach ($folder in $folders) {
     }
 
     Write-TimedMessage "🟢 Completed processing folder: $folder"
-    Write-Host "========================="
 }

scripts/Rename-It.ps1

@@ -29,8 +29,8 @@ $fileExtension = $fileName.Substring($fileName.LastIndexOf('.') + 1)
 
 # Create a copy of the zip/document file in the $folderName/Skeleton folder at the top level
 $copySource = "$folderName/Skeleton/$fileNameNoExt.$ext"
-$renameDestinationFolder = "$rootSrcDir/out"
-$renameDestinationFilePath = "$renameDestinationFolder/$fileNameNoExt.$fileExtension"
+$renameDestinationFolder = $rootSrcDir + "out/"
+$renameDestinationFilePath = "$renameDestinationFolder$fileNameNoExt.$fileExtension"
 
 # Create rename destination folder if it doesn't exist
 if (-not (Test-Path $renameDestinationFolder)) {

scripts/Zip-It.ps1

@@ -1,15 +1,20 @@
 # This script uses 7-Zip to compress files and directory in the ${docDirPath}/XMLsource directory into a zip file.
 
 
-$docDirPath = $args[0]
-if (-not $docDirPath) {
-    Write-Host "Error: No docDirPath specified. Usage: Zip-It.ps1 <docDirPath>"
+$dirPath = $args[0]
+if (-not $dirPath) {
+    Write-Host "Error: No dirPath specified. Usage: Zip-It.ps1 <dirPath>"
     exit 1
 }
+Write-Host "dirPath: $dirPath"
+
+# Import utility functions
+$scriptPath = Split-Path -Parent $MyInvocation.MyCommand.Path
+. "$scriptPath/utils/Path.ps1"
 
 $currentDir = (Get-Location).Path + "/"
 Write-Host "Current directory: $currentDir"
-$docDirPath = GetAbsPath -path $docDirPath -basePath $currentDir
+$docDirPath = GetAbsPath -path $dirPath -basePath $currentDir
 Write-Host "Using docDirPath: $docDirPath"
 
 $docDirPath = NormalizeDirPath $docDirPath
@@ -22,7 +27,8 @@ Write-Host "Staring the compression process..."
 
 # Define the source directory and the output zip file
 $xmlDir = $docDirPath + "XMLsource/"
-$outputZipFile = $docDirPath + "Skeleton/$fileNameNoExt.zip"
+$outputDir = $docDirPath + "Skeleton/"
+$outputZipFile = $outputDir + "$fileNameNoExt.zip"
 
 # Path to the 7-Zip executable
 $sevenZipPath = "7z"  # Assumes 7-Zip is in the system PATH. Adjust if necessary.
@@ -35,29 +41,21 @@ if (-not (Test-Path $xmlDir)) {
 }
 
 # Ensure the destination directory exists
-$outputDir = Split-Path -Path $outputZipFile
 Write-Host "Output directory: $outputDir"
 
 if (-not (Test-Path $outputDir)) {
     Write-Host "Creating output directory: $outputDir"
     New-Item -ItemType Directory -Path $outputDir -Force | Out-Null
 }
 
-# Ensure the destination directory exists
-$outputDir = Split-Path -Path $outputZipFile
-if (-not (Test-Path $outputDir)) {
-    Write-Host "Creating output directory: $outputDir"
-    New-Item -ItemType Directory -Path $outputDir -Force | Out-Null
-}
-
 # Change the working directory to the source folder
-Write-Host "Changing directory to $outputDir..."
-Set-Location -Path $outputDir
+Write-Host "Changing directory to $xmlDir"
+Set-Location -Path $xmlDir
 Write-Host "Current directory after change: $(Get-Location)"
 
 # Compress the files and directory using 7-Zip
 Write-Host "Compressing files in $xmlDir to $outputDir..."
-& $sevenZipPath a -tzip "${outputDir}${fileNameNoExt}.zip" "*" | Out-Null
+& $sevenZipPath a -tzip "$outputZipFile" "*" | Out-Null
 
 # Check if the compression was successful using $LASTEXITCODE
 if ($LASTEXITCODE -ne 0) {
@@ -72,4 +70,9 @@ if ($LASTEXITCODE -ne 0) {
     exit $LASTEXITCODE
 }
 
+if (-not (Test-Path $outputZipFile)) {
+    Write-Host "Error: Zip file not found after compression: $outputZipFile"
+    exit 1
+}
+
 Write-Host "Compression completed successfully. Zip file created at: $outputDir"