Merge pull request #3432 from toni-moreno/add_rpm_deb_separate_commands

add option pkg-rpm and pkg-deb to create separately both packages #3407
This commit is contained in:
Torkel Ödegaard 2015-12-07 11:46:00 +01:00
commit 1ebb18ae57

View File

@ -76,6 +76,14 @@ func main() {
grunt("release") grunt("release")
createLinuxPackages() createLinuxPackages()
case "pkg-rpm":
grunt("release")
createRpmPackages()
case "pkg-deb":
grunt("release")
createDebPackages()
case "latest": case "latest":
makeLatestDistCopies() makeLatestDistCopies()
@ -147,7 +155,7 @@ type linuxPackageOptions struct {
depends []string depends []string
} }
func createLinuxPackages() { func createDebPackages() {
createPackage(linuxPackageOptions{ createPackage(linuxPackageOptions{
packageType: "deb", packageType: "deb",
homeDir: "/usr/share/grafana", homeDir: "/usr/share/grafana",
@ -167,7 +175,9 @@ func createLinuxPackages() {
depends: []string{"adduser", "libfontconfig"}, depends: []string{"adduser", "libfontconfig"},
}) })
}
func createRpmPackages() {
createPackage(linuxPackageOptions{ createPackage(linuxPackageOptions{
packageType: "rpm", packageType: "rpm",
homeDir: "/usr/share/grafana", homeDir: "/usr/share/grafana",
@ -189,6 +199,11 @@ func createLinuxPackages() {
}) })
} }
func createLinuxPackages() {
createDebPackages()
createRpmPackages()
}
func createPackage(options linuxPackageOptions) { func createPackage(options linuxPackageOptions) {
packageRoot, _ := ioutil.TempDir("", "grafana-linux-pack") packageRoot, _ := ioutil.TempDir("", "grafana-linux-pack")