Cleanup

magefile.go

@@ -643,31 +643,13 @@ func (Release) Zip() error {
 	return nil
 }
 
-// Creates a debian package from a built binary
-func (Release) Deb() {
-	runAndStreamOutput(
-		"fpm",
-		"-s", "dir",
-		"-t", "deb",
-		"--url", "https://vikunja.io",
-		"-n", "vikunja",
-		"-v", PkgVersion,
-		"--license", "GPLv3",
-		"--directories", "/opt/vikunja",
-		"--after-install", "./build/after-install.sh",
-		"--description", "'Vikunja is an open-source todo application, written in Go. It lets you create lists,tasks and share them via teams or directly between users.'",
-		"-m", "maintainers@vikunja.io",
-		"-p", RootPath+"/"+Executable+"-"+Version+"_amd64.deb",
-		RootPath+"/"+BinLocation+"=/opt/vikunja/vikunja",
-		"./config.yml.sample=/etc/vikunja/config.yml",
-	)
-}
-
 // Creates a debian repo structure
 func (Release) Reprepro() {
-	runAndStreamOutput("reprepro_expect", "debian", "includedeb", "strech", RootPath+"/"+Executable+"-"+Version+"_amd64.deb")
+	mg.Deps(setVersion, setBinLocation)
+	runAndStreamOutput("reprepro_expect", "debian", "includedeb", "strech", RootPath+"/"+DIST+"/os-packages/"+Executable+"_"+strings.ReplaceAll(VersionNumber, "v0", "0")+"_amd64.deb")
 }
 
+// Creates deb, rpm and apk packages
 func (Release) Packages() error {
 	mg.Deps(initVars)
 	if err := exec.Command("nfpm").Run(); err != nil && strings.Contains(err.Error(), "executable file not found") {