Merge pull request #1582 from erstec/erstec-installers-naming-cherrypick

Installers file naming cherrypick

4 files changed, 45 insertions, 6 deletions

diff --git a/assets/windows/installer.iss b/assets/windows/installer.iss
index f82c30bf..89f56efa 100644
--- a/assets/windows/installer.iss
+++ b/assets/windows/installer.iss
@@ -14,7 +14,7 @@
 #define CompanyUrl "https://github.com/iNavFlight/inav"

 #define ExecutableFileName "inav-configurator.exe"

 #define GroupName "INAV"

-#define InstallerFileName "INAV-Configurator_" + archName + "-installer" + "_" + version

+#define InstallerFileName "INAV-Configurator_" + archName + "_" + version

 #define SourcePath "..\..\" + sourceFolder + "\inav-configurator\" + archName

 #define TargetFolderName "INAV-Configurator"

 #define UpdatesUrl "https://github.com/iNavFlight/inav-configurator/releases"

diff --git a/gulpfile.js b/gulpfile.js
index 400d174d..7e3fa2a1 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -286,9 +286,13 @@ function get_nw_version() {
     return semver.valid(semver.coerce(require('./package.json').dependencies.nw));
 }
 
+function get_release_filename_base(platform) {
+    return 'INAV-Configurator_' + platform;
+}
+
 function get_release_filename(platform, ext, addition = '') {
     var pkg = require('./package.json');
-    return 'INAV-Configurator_' + platform + addition + '_' + pkg.version + '.' + ext;
+    return get_release_filename_base(platform) + addition + '_' + pkg.version + '.' + ext;
 }
 
 function build_win_zip(arch) {
@@ -298,7 +302,7 @@ function build_win_zip(arch) {
         // Create ZIP
         console.log(`Creating ${arch} ZIP file...`);
         var src = path.join(appsDir, pkg.name, arch);
-        var output = fs.createWriteStream(path.join(appsDir, get_release_filename(arch, 'zip', '-portable')));
+        var output = fs.createWriteStream(path.join(appsDir, get_release_filename(arch, 'zip')));
         var archive = archiver('zip', {
                 zlib: { level: 9 }
         });
@@ -582,6 +586,24 @@ function release_deb(arch) {
     }
 }
 
+function post_release_deb(arch) {
+    return function post_release_linux_deb(done) {
+        if ((arch === 'linux32') || (arch === 'linux64')) {
+            var rename = require("gulp-rename");
+            const metadata = require('./package.json');
+            const renameFrom = path.join(appsDir, metadata.name + '_' + metadata.version + '_' + getLinuxPackageArch('.deb', arch) + '.deb');
+            const renameTo = path.join(appsDir, get_release_filename_base(arch) + '_' + metadata.version + '.deb');
+            // Rename .deb build to common naming
+            console.log(`Renaming .deb installer ${renameFrom} to ${renameTo}`);
+            return gulp.src(renameFrom)
+                    .pipe(rename(renameTo))
+                    .pipe(gulp.dest("."));
+        }
+
+        return done();
+    }
+}
+
 function release_rpm(arch) {
     return function release_rpm_proc(done) {
         if (!getArguments().installer) {
@@ -607,7 +629,7 @@ function release_rpm(arch) {
         createDirIfNotExists(appsDir);
 
         const options = {
-            name: metadata.name,
+            name: get_release_filename_base(arch), // metadata.name,
             version: metadata.version.replace(NAME_REGEX, '_'), // RPM does not like release candidate versions
             buildArch: getLinuxPackageArch('rpm', arch),
             vendor: metadata.author,
@@ -680,8 +702,8 @@ function releaseLinux(bits) {
     }
 }
 
-gulp.task('release-linux32', gulp.series(releaseLinux(32), post_build('linux32', appsDir), release_deb('linux32')));
-gulp.task('release-linux64', gulp.series(releaseLinux(64), post_build('linux64', appsDir), release_deb('linux64'), release_rpm('linux64')));
+gulp.task('release-linux32', gulp.series(releaseLinux(32), post_build('linux32', appsDir), release_deb('linux32'), post_release_deb('linux32')));
+gulp.task('release-linux64', gulp.series(releaseLinux(64), post_build('linux64', appsDir), release_deb('linux64'), post_release_deb('linux64'), release_rpm('linux64')));
 
 // Create distributable .zip files in ./apps
 gulp.task('release', gulp.series('apps',  getPlatforms().map(function(v) { return 'release-' + v; })));
diff --git a/package-lock.json b/package-lock.json
index f71e4c6e..59d15532 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -33,6 +33,7 @@
       "devDependencies": {
         "@quanle94/innosetup": "^6.0.2",
         "gulp-debian": "^0.1.9",
+        "gulp-rename": "^2.0.0",
         "nw-builder": "^3.5.7",
         "rpm-builder": "^1.2.1",
         "semver": "6.3.0"
@@ -4160,6 +4161,15 @@
         "graceful-fs": "^4.1.6"
       }
     },
+    "node_modules/gulp-rename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.0.0.tgz",
+      "integrity": "sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/gulp-util": {
       "version": "3.0.8",
       "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
@@ -12821,6 +12831,12 @@
         }
       }
     },
+    "gulp-rename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.0.0.tgz",
+      "integrity": "sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==",
+      "dev": true
+    },
     "gulp-util": {
       "version": "3.0.8",
       "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
diff --git a/package.json b/package.json
index ad949094..9c372695 100755
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
   },
   "devDependencies": {
     "gulp-debian": "^0.1.9",
+    "gulp-rename": "^2.0.0",
     "nw-builder": "^3.5.7",
     "rpm-builder": "^1.2.1",
     "semver": "6.3.0",