diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d679a3c..0472490 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -79,13 +79,6 @@ jobs: DISK_URL: ${{ secrets.DISK_URL }} - name: Install run: npm ci - - name: Diagnose deb maker - if: matrix.os == 'ubuntu-latest' - run: | - node -e "const r=require('module').createRequire(require.resolve('@electron-forge/maker-base/package.json'));try{r('electron-installer-debian');console.log('OK from maker-base')}catch(e){console.error('FAIL from maker-base:',e)}" - node -e "const {MakerDeb}=require('@electron-forge/maker-deb');const m=new MakerDeb({});console.log('isSupported:',m.isSupportedOnCurrentPlatform());try{m.ensureExternalBinariesExist();console.log('binaries OK')}catch(e){console.error('binaries:',e.message)}" - ls -la node_modules/electron-installer-debian/ || echo "NOT INSTALLED" - which dpkg fakeroot || echo "missing binaries" - name: Make if: startsWith(github.ref, 'refs/tags/') run: npm run make -- --arch=${{ matrix.arch }} diff --git a/patches/@electron+packager+18.4.4.patch b/patches/@electron+packager+18.4.4.patch index 2921725..bcb595e 100644 --- a/patches/@electron+packager+18.4.4.patch +++ b/patches/@electron+packager+18.4.4.patch @@ -13,8 +13,8 @@ index d318f6c..bfde740 100644 + // await (0, resedit_1.resedit)(this.electronBinaryPath, resOpts); + + const { spawnSync } = require('child_process'); -+ const resEditProcess = spawnSync('node', [ -+ 'C:\\Users\\FelixRieseberg\\Code\\windows95\\tools\\resedit.js', ++ const resEditProcess = spawnSync(process.execPath, [ ++ require('path').resolve(process.cwd(), 'tools', 'resedit.js'), + this.electronBinaryPath + ], { + stdio: 'inherit'