Skip to content

Commit e8c28e5

Browse files
committed
Fix os.Rename paths in darwin-dmg and darwin-pkg packaging
1 parent 546a7df commit e8c28e5

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

cmd/packaging/darwin-dmg.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"fmt"
55
"os"
66
"os/exec"
7+
"path/filepath"
78
)
89

910
// DarwinDmgTask packaging for darwin as dmg
@@ -22,8 +23,8 @@ var DarwinDmgTask = &packagingTask{
2223
if err != nil {
2324
return "", err
2425
}
25-
appBundleOriginalPath := fmt.Sprintf("dmgdir/%s %s.app", applicationName, version)
26-
appBundleFinalPath := fmt.Sprintf("dmgdir/%s.app", applicationName)
26+
appBundleOriginalPath := filepath.Join(tmpPath, "dmgdir", fmt.Sprintf("%s %s.app", applicationName, version))
27+
appBundleFinalPath := filepath.Join(tmpPath, "dmgdir", fmt.Sprintf("%s.app", applicationName))
2728
err = os.Rename(appBundleOriginalPath, appBundleFinalPath)
2829
if err != nil {
2930
return "", err

cmd/packaging/darwin-pkg.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ var DarwinPkgTask = &packagingTask{
2727
return "", err
2828
}
2929

30-
appBundleOriginalPath := fmt.Sprintf("flat/root/Applications/%s %s.app", applicationName, version)
31-
appBundleFinalPath := fmt.Sprintf("flat/root/Applications/%s.app", applicationName)
30+
appBundleOriginalPath := filepath.Join(tmpPath, "flat", "root", "Applications", fmt.Sprintf("%s %s.app", applicationName, version))
31+
appBundleFinalPath := filepath.Join(tmpPath, "flat", "root", "Applications", fmt.Sprintf("%s.app", applicationName))
3232
err = os.Rename(appBundleOriginalPath, appBundleFinalPath)
3333
if err != nil {
3434
return "", err

0 commit comments

Comments
 (0)