Add regenerate pass through from scan to fingerprint

debricked · Aug 7, 2024 · cee66f1 · cee66f1
1 parent 5ff106a
commit cee66f1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/build/docker/debian.Dockerfile b/build/docker/debian.Dockerfile
@@ -92,10 +92,10 @@ RUN curl -fsSLO https://dot.net/v1/dotnet-install.sh \
 
 ENV GOLANG_VERSION 1.22
 RUN apt -y update && apt -y upgrade && apt -y install \
-    python3 \
-    python3-venv \
+    python3.10 \
+    python3.10-venv \
     ca-certificates \
-    python3-pip && \
+    python3.10-pip && \
     apt -y install -t unstable \
     golang-$GOLANG_VERSION \
     openjdk-21-jre && \

diff --git a/internal/cmd/fingerprint/fingerprint.go b/internal/cmd/fingerprint/fingerprint.go
@@ -91,7 +91,7 @@ func RunE(f fingerprint.IFingerprint) func(_ *cobra.Command, args []string) erro
 			if errors.Is(err, &fingerprint.FingerprintFileExistsError{}) {
 				fmt.Println(
 					"Fingerprint file exists and command is configured to not overwrite. ",
-					"To generate new fingerprint file either remove/rename old file or ",
+					"To generate a new fingerprint file either remove/rename old file or ",
 					"change flag '--regenerate' to 'true'",
 				)
 				return nil

diff --git a/internal/fingerprint/fingerprint.go b/internal/fingerprint/fingerprint.go
@@ -91,8 +91,6 @@ func (f *Fingerprinter) FingerprintFiles(options DebrickedOptions) (Fingerprints
 	if !errors.Is(err, os.ErrNotExist) {
 		fingerprintFileExists = true
 	}
-	fmt.Printf("output path=%s", options.OutputPath)
-	fmt.Printf("regen=%t, file=%t\n", options.Regenerate, fingerprintFileExists)
 	if !options.Regenerate && fingerprintFileExists {
 		return fingerprints, &FingerprintFileExistsError{}
 	}

diff --git a/internal/scan/scanner.go b/internal/scan/scanner.go
@@ -172,6 +172,7 @@ func (dScanner *DebrickedScanner) scanFingerprint(options DebrickedOptions) erro
 				Inclusions:                   append(options.Inclusions, fingerprint.DefaultInclusionsFingerprint()...),
 				MinFingerprintContentLength:  options.MinFingerprintContentLength,
 				FingerprintCompressedContent: false,
+				Regenerate:                   options.Regenerate > 0,
 			},
 		)
 		if err != nil {