diff --git a/changelog.html b/changelog.html old mode 100755 new mode 100644 diff --git a/gulpfile.js b/gulpfile.js index 23fd629c..b709c8a6 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -29,6 +29,8 @@ const APPS_DIR = './apps/'; const DEBUG_DIR = './debug/'; const RELEASE_DIR = './release/'; +const LINUX_INSTALL_DIR = '/opt/betaflight'; + var nwBuilderOptions = { version: '0.35.3', files: './dist/**/*', @@ -186,7 +188,7 @@ function getRunDebugAppCommand(arch) { } function getReleaseFilename(platform, ext) { - return 'betaflight-configurator_' + pkg.version + '_' + platform + '.' + ext; + return `${pkg.name}_${pkg.version}_${platform}.${ext}`; } function clean_dist() { @@ -545,11 +547,12 @@ function release_deb(arch, done) { architecture: getLinuxPackageArch('deb', arch), maintainer: pkg.author, description: pkg.description, - postinst: ['xdg-desktop-menu install /opt/betaflight/betaflight-configurator/betaflight-configurator.desktop'], - prerm: ['xdg-desktop-menu uninstall betaflight-configurator.desktop'], + preinst: [`rm -rf ${LINUX_INSTALL_DIR}/${pkg.name}`], + postinst: [`chown root:root ${LINUX_INSTALL_DIR}`, `chown -R root:root ${LINUX_INSTALL_DIR}/${pkg.name}`, `xdg-desktop-menu install ${LINUX_INSTALL_DIR}/${pkg.name}/${pkg.name}.desktop`], + prerm: [`xdg-desktop-menu uninstall ${pkg.name}.desktop`], depends: 'libgconf-2-4', changelog: [], - _target: 'opt/betaflight/betaflight-configurator', + _target: `${LINUX_INSTALL_DIR}/${pkg.name}`, _out: RELEASE_DIR, _copyright: 'assets/linux/copyright', _clean: true @@ -579,9 +582,9 @@ function release_rpm(arch, done) { files: [ { cwd: path.join(APPS_DIR, pkg.name, arch), src: '*', - dest: '/opt/betaflight/betaflight-configurator' } ], - postInstallScript: ['xdg-desktop-menu install /opt/betaflight/betaflight-configurator/betaflight-configurator.desktop'], - preUninstallScript: ['xdg-desktop-menu uninstall betaflight-configurator.desktop'], + dest: `${LINUX_INSTALL_DIR}/${pkg.name}` } ], + postInstallScript: [`xdg-desktop-menu install ${LINUX_INSTALL_DIR}/${pkg.name}/${pkg.name}.desktop`], + preUninstallScript: [`xdg-desktop-menu uninstall ${pkg.name}.desktop`], tempDir: path.join(RELEASE_DIR,'tmp-rpm-build-' + arch), keepTemp: false, verbose: false, diff --git a/libraries/jbox/jBox.css b/libraries/jbox/jBox.css old mode 100755 new mode 100644 diff --git a/libraries/jbox/jBox.min.js b/libraries/jbox/jBox.min.js old mode 100755 new mode 100644 diff --git a/libraries/jbox/themes/ModalBorder.css b/libraries/jbox/themes/ModalBorder.css old mode 100755 new mode 100644 diff --git a/libraries/jbox/themes/NoticeBorder.css b/libraries/jbox/themes/NoticeBorder.css old mode 100755 new mode 100644 diff --git a/libraries/jbox/themes/TooltipBorder.css b/libraries/jbox/themes/TooltipBorder.css old mode 100755 new mode 100644 diff --git a/libraries/jbox/themes/TooltipDark.css b/libraries/jbox/themes/TooltipDark.css old mode 100755 new mode 100644 diff --git a/libraries/q.js b/libraries/q.js old mode 100755 new mode 100644 diff --git a/manifest.json b/manifest.json old mode 100755 new mode 100644 diff --git a/package-lock.json b/package-lock.json index 64ef7a12..5e3c4fc3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4639,7 +4639,7 @@ "semver": "^5.5.0", "simple-glob": "~0.2.0", "tar-fs": "^1.13.0", - "temp": "github:adam-lynch/node-temp#remove_tmpdir_dep", + "temp": "github:adam-lynch/node-temp#279c1350cb7e4f02515d91da9e35d39a40774016", "thenify": "^3.3.0", "update-notifier": "^2.4.0", "winresourcer": "^0.9.0" diff --git a/resources/models/fallback.png b/resources/models/fallback.png old mode 100755 new mode 100644 diff --git a/src/css/tabs/landing.css b/src/css/tabs/landing.css old mode 100755 new mode 100644 diff --git a/src/css/tabs/logging.css b/src/css/tabs/logging.css old mode 100755 new mode 100644 diff --git a/src/css/tabs/servos.css b/src/css/tabs/servos.css old mode 100755 new mode 100644 diff --git a/src/js/RateCurve.js b/src/js/RateCurve.js old mode 100755 new mode 100644 diff --git a/src/js/data_storage.js b/src/js/data_storage.js old mode 100755 new mode 100644 diff --git a/src/js/eventPage.js b/src/js/eventPage.js old mode 100755 new mode 100644 diff --git a/src/js/msp.js b/src/js/msp.js old mode 100755 new mode 100644 diff --git a/src/js/port_handler.js b/src/js/port_handler.js old mode 100755 new mode 100644 diff --git a/src/js/serial_backend.js b/src/js/serial_backend.js old mode 100755 new mode 100644 diff --git a/src/js/tabs/firmware_flasher.js b/src/js/tabs/firmware_flasher.js old mode 100755 new mode 100644 diff --git a/src/js/tabs/osd.js b/src/js/tabs/osd.js old mode 100755 new mode 100644 diff --git a/src/js/tabs/servos.js b/src/js/tabs/servos.js old mode 100755 new mode 100644 diff --git a/src/main.html b/src/main.html old mode 100755 new mode 100644 diff --git a/src/support/svg_model_motors.rb b/src/support/svg_model_motors.rb old mode 100755 new mode 100644 diff --git a/src/tabs/firmware_flasher.html b/src/tabs/firmware_flasher.html old mode 100755 new mode 100644 diff --git a/src/tabs/logging.html b/src/tabs/logging.html old mode 100755 new mode 100644 diff --git a/src/tabs/servos.html b/src/tabs/servos.html old mode 100755 new mode 100644