Use os.Rename and also rename the bundle for darwin-pkg packaging

Author: sidevesh

assets/packaging/darwin-pkg/Distribution.tmpl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <installer-gui-script minSpecVersion="1">
 	<title>{{.applicationName}}</title>
-	<background alignment="topleft" file="root/Applications/{{.applicationName}} {{.version}}.app/Contents/MacOS/assets/icon.png"/>
+	<background alignment="topleft" file="root/Applications/{{.applicationName}}.app/Contents/MacOS/assets/icon.png"/>
 	<choices-outline>
 	    <line choice="choiceBase"/>
     </choices-outline>

assets/packaging/darwin-pkg/PackageInfo.tmpl

@@ -1,5 +1,5 @@
 <pkg-info format-version="2" identifier="{{.organizationName}}.base.pkg" version="{{.version}}" install-location="/" auth="root">
 	<bundle-version>
-		<bundle id="{{.organizationName}}" CFBundleIdentifier="{{.organizationName}}.{{.packageName}}" path="./Applications/{{.applicationName}} {{.version}}.app" CFBundleVersion="{{.version}}"/>
+		<bundle id="{{.organizationName}}" CFBundleIdentifier="{{.organizationName}}.{{.packageName}}" path="./Applications/{{.applicationName}}.app" CFBundleVersion="{{.version}}"/>
     </bundle-version>
 </pkg-info>

cmd/packaging/darwin-dmg.go

@@ -22,13 +22,9 @@ var DarwinDmgTask = &packagingTask{
 		if err != nil {
 			return "", err
 		}
-		appFileOriginalPath := fmt.Sprintf("dmgdir/%s %s.app", applicationName, version)
-		appFileFinalPath := fmt.Sprintf("dmgdir/%s.app", applicationName)
-		cmdRenameApp := exec.Command("mv", appFileOriginalPath, appFileFinalPath)
-		cmdRenameApp.Dir = tmpPath
-		cmdRenameApp.Stdout = os.Stdout
-		cmdRenameApp.Stderr = os.Stderr
-		err = cmdRenameApp.Run()
+		appBundleOriginalPath := fmt.Sprintf("dmgdir/%s %s.app", applicationName, version)
+		appBundleFinalPath := fmt.Sprintf("dmgdir/%s.app", applicationName)
+		err = os.Rename(appBundleOriginalPath, appBundleFinalPath)
 		if err != nil {
 			return "", err
 		}

cmd/packaging/darwin-pkg.go

@@ -27,6 +27,13 @@ var DarwinPkgTask = &packagingTask{
 			return "", err
 		}
 
+		appBundleOriginalPath := fmt.Sprintf("flat/root/Applications/%s %s.app", applicationName, version)
+		appBundleFinalPath := fmt.Sprintf("flat/root/Applications/%s.app", applicationName)
+		err = os.Rename(appBundleOriginalPath, appBundleFinalPath)
+		if err != nil {
+			return "", err
+		}
+
 		cmdFind := exec.Command("find", ".")
 		cmdFind.Dir = filepath.Join(tmpPath, "flat", "root")
 		cmdCpio := exec.Command("cpio", "-o", "--format", "odc", "--owner", "0:80")