Fix bug with deb installer

grafana · Jul 7, 2023 · 1aecb9f · 1aecb9f
1 parent ccd30ab
commit 1aecb9f
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/pipelines/package_installer.go b/pipelines/package_installer.go
@@ -13,6 +13,7 @@ import (
 	"dagger.io/dagger"
 	"github.com/grafana/grafana-build/containers"
 	"github.com/grafana/grafana-build/executil"
+	"github.com/grafana/grafana-build/versions"
 	"golang.org/x/sync/errgroup"
 	"golang.org/x/sync/semaphore"
 )
@@ -54,8 +55,18 @@ func PackageInstaller(ctx context.Context, d *dagger.Client, args PipelineArgs,
 				fmt.Sprintf("--version=%s", tarOpts.Version),
 				fmt.Sprintf("--package=%s", "/src/"+name),
 			}
+
+			vopts = versions.OptionsFor(tarOpts.Version)
 		)
 
+		// If this is a debian installer and this version had a prerm script (introduced in v9.5)...
+		// TODO: this logic means that rpms can't also ahve a beforeremove. Not important at the moment because it's static (in pipelines/rpm.go) and it doesn't have beforeremove set.
+		if vopts.DebPreRM.IsSet && vopts.DebPreRM.Value && opts.PackageType == "deb" {
+			if opts.BeforeRemove != "" {
+				fpmArgs = append(fpmArgs, fmt.Sprintf("--before-remove=%s", opts.BeforeRemove))
+			}
+		}
+
 		for _, c := range opts.ConfigFiles {
 			fpmArgs = append(fpmArgs, fmt.Sprintf("--config-files=%s", c[1]))
 		}
@@ -64,10 +75,6 @@ func PackageInstaller(ctx context.Context, d *dagger.Client, args PipelineArgs,
 			fpmArgs = append(fpmArgs, fmt.Sprintf("--after-install=%s", opts.AfterInstall))
 		}
 
-		if opts.BeforeRemove != "" {
-			fpmArgs = append(fpmArgs, fmt.Sprintf("--before-remove=%s", opts.BeforeRemove))
-		}
-
 		for _, d := range opts.Depends {
 			fpmArgs = append(fpmArgs, fmt.Sprintf("--depends=%s", d))
 		}
@@ -115,14 +122,7 @@ func PackageInstaller(ctx context.Context, d *dagger.Client, args PipelineArgs,
 			WithEnvVariable("XZ_DEFAULTS", "-T0").
 			WithExec([]string{"tar", "--strip-components=1", "-xvf", "/src/grafana.tar.gz", "-C", "/src"}).
 			WithExec([]string{"ls", "-al", "/src"})
-		// Fix for issue where some older versions did not have BeforeRemove or AfterInstall scripts: Still add them, but provide empty scripts that do nothing if they don't exist
-		if opts.AfterInstall != "" {
-			container = container.WithExec([]string{"touch", opts.AfterInstall})
-		}
-		// Fix for issue where some older versions did not have BeforeRemove or AfterInstall scripts: Still add them, but provide empty scripts that do nothing if they don't exist
-		if opts.BeforeRemove != "" {
-			container = container.WithExec([]string{"touch", opts.BeforeRemove})
-		}
+
 		container = container.
 			WithExec(append([]string{"mkdir", "-p"}, packagePaths...)).
 			// the "wrappers" scripts are the same as grafana-cli/grafana-server but with some extra shell commands before/after execution.