kittyfangs
/
fchat-rising
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor

This commit is contained in:
Mr. Stallion 2023-09-03 13:11:12 -07:00
parent c1dc5952fe
commit 1a7cdad7cd
2 changed files with 71 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
electron/pack.js
View File

@ -4,6 +4,7 @@ const pkg = require(path.join(__dirname, 'package.json'));
const fs = require('fs'); const fs = require('fs');
const child_process = require('child_process'); const child_process = require('child_process');
const _ = require('lodash'); const _ = require('lodash');
const axios = require('axios');
const distDir = path.join(__dirname, 'dist'); const distDir = path.join(__dirname, 'dist');
const isBeta = pkg.version.indexOf('beta') !== -1; const isBeta = pkg.version.indexOf('beta') !== -1;
@ -55,7 +56,7 @@ require('electron-packager')({
osxSign: process.argv.length > 2 ? {identity: process.argv[2]} : false, osxSign: process.argv.length > 2 ? {identity: process.argv[2]} : false,
prune: false, prune: false,
arch: process.platform === 'darwin' ? ['x64', 'arm64'] : ['x64', 'arm64'], arch: process.platform === 'darwin' ? ['x64', 'arm64'] : ['x64', 'arm64'],
}).then((appPaths) => { }).then(async (appPaths) => {
if (process.env.SKIP_INSTALLER) { if (process.env.SKIP_INSTALLER) {
return; return;
} }
@ -120,19 +121,39 @@ require('electron-packager')({
} else { } else {
console.log('Creating Linux AppImage'); console.log('Creating Linux AppImage');
async function downloadAppImageTool(appImageBase) {
const localArch = process.arch === 'x64' ? 'x86_64' : 'aarch64';
const res = await axios.get(`https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-${localArch}.AppImage`);
const appImagePath = path.join(appImageBase, 'appimagetool.AppImage');
fs.writeFileSync(appImagePath, res.data);
fs.chmodSync(appImagePath, 0o755);
const result = child_process.spawnSync(appImagePath, ['--appimage-extract'], {cwd: appImageBase, env: { ...process.env }});
if (result.status !== 0) {
console.log('Run failed', 'APPIMAGE EXTRACT', {status: result.status, call: result.error?.syscall, args: result.error?.spawnargs, path: result.error?.path, code: result.error?.code, stdout: String(result.stdout), stderr: String(result.stderr) });
}
return appImagePath;
}
const appImageBase = path.join(distDir, 'downloaded');
fs.mkdirSync(appImageBase, {recursive: true});
const appImagePath = await downloadAppImageTool(appImageBase);
for (const appPath of appPaths) { for (const appPath of appPaths) {
const appArch = appPath.match(/F-Chat-linux-([a-zA-Z0-9]+)$/)[1]; const appArch = appPath.match(/F-Chat-linux-([a-zA-Z0-9]+)$/)[1];
const appArchLong = appArch === 'x64' ? 'x86_64' : 'aarch64'; const appArchLong = appArch === 'x64' ? 'x86_64' : 'aarch64';
const buildPath = path.join(__dirname, 'build'); const buildPath = path.join(__dirname, 'build');
const distFinal = path.join(distDir, appArch);
fs.renameSync(path.join(appPath, 'F-Chat'), path.join(appPath, 'AppRun')); fs.renameSync(path.join(appPath, 'F-Chat'), path.join(appPath, 'AppRun'));
fs.copyFileSync(path.join(buildPath, 'icon.png'), path.join(appPath, 'icon.png')); fs.copyFileSync(path.join(buildPath, 'icon.png'), path.join(appPath, 'icon.png'));
const libDir = path.join(appPath, 'usr', 'lib'), libSource = path.join(buildPath, 'linux-libs'); const libDir = path.join(appPath, 'usr', 'lib'), libSource = path.join(buildPath, 'linux-libs');
fs.mkdirSync(libDir, {recursive: true});
fs.mkdirSync(distFinal, {recursive: true}); fs.mkdirSync(libDir, {recursive: true});
for(const file of fs.readdirSync(libSource)) { for(const file of fs.readdirSync(libSource)) {
fs.copyFileSync(path.join(libSource, file), path.join(libDir, file)); fs.copyFileSync(path.join(libSource, file), path.join(libDir, file));
@ -141,33 +162,23 @@ require('electron-packager')({
fs.symlinkSync(path.join(appPath, 'icon.png'), path.join(appPath, '.DirIcon')); fs.symlinkSync(path.join(appPath, 'icon.png'), path.join(appPath, '.DirIcon'));
fs.writeFileSync(path.join(appPath, 'fchat.desktop'), '[Desktop Entry]\nName=F-Chat\nExec=AppRun\nIcon=icon\nType=Application\nCategories=GTK;GNOME;Utility;'); fs.writeFileSync(path.join(appPath, 'fchat.desktop'), '[Desktop Entry]\nName=F-Chat\nExec=AppRun\nIcon=icon\nType=Application\nCategories=GTK;GNOME;Utility;');
require('axios').get(`https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-${appArchLong}.AppImage`, {responseType: 'stream'}).then((res) => { const args = [appPath, 'fchat.AppImage', '-u', 'gh-releases-zsync|hearmeneigh|fchat-rising|latest|F-Chat-Rising-*-linux.AppImage.zsync'];
const downloaded = path.join(distFinal, 'appimagetool.AppImage');
const stream = fs.createWriteStream(downloaded);
res.data.pipe(stream);
stream.on('close', () => {
const args = [appPath, 'fchat.AppImage', '-u', 'gh-releases-zsync|hearmeneigh|fchat-rising|latest|F-Chat-Rising-*-linux.AppImage.zsync'];
if(process.argv.length > 2) args.push('-s', '--sign-key', process.argv[2]); if(process.argv.length > 2) {
else console.warn('Warning: Creating unsigned AppImage'); args.push('-s', '--sign-key', process.argv[2]);
} else {
console.warn('Warning: Creating unsigned AppImage');
}
if(process.argv.length > 3) args.push('--sign-args', `--no-tty --pinentry-mode loopback --yes --passphrase=${process.argv[3]}`); if(process.argv.length > 3) {
args.push('--sign-args', `--no-tty --pinentry-mode loopback --yes --passphrase=${process.argv[3]}`);
}
fs.chmodSync(downloaded, 0o755); const appRunResult = child_process.spawnSync(path.join(distFinal, 'squashfs-root', 'AppRun'), args, {cwd: distFinal, env: {ARCH: appArchLong }});
const extResult = child_process.spawnSync(downloaded, ['--appimage-extract'], {cwd: distFinal, env: { ...process.env, ARCH: appArchLong }}); if (appRunResult.status !== 0) {
console.log('Run failed', 'APPRUN', appArch, {status: appRunResult.status, call: appRunResult.error?.syscall, args: appRunResult.error?.spawnargs, path: appRunResult.error?.path, code: appRunResult.error?.code, stdout: String(appRunResult.stdout), stderr: String(appRunResult.stderr) });
if (extResult.status !== 0) { }
console.log('Run failed', 'EXTRACT', appArch, {status: extResult.status, call: extResult.error?.syscall, args: extResult.error?.spawnargs, path: extResult.error?.path, code: extResult.error?.code, stdout: String(extResult.stdout), stderr: String(extResult.stderr) });
}
const appRunResult = child_process.spawnSync(path.join(distFinal, 'squashfs-root', 'AppRun'), args, {cwd: distFinal, env: {ARCH: appArchLong }});
if (appRunResult.status !== 0) {
console.log('Run failed', 'APPRUN', appArch, {status: appRunResult.status, call: appRunResult.error?.syscall, args: appRunResult.error?.spawnargs, path: appRunResult.error?.path, code: appRunResult.error?.code, stdout: String(appRunResult.stdout), stderr: String(appRunResult.stderr) });
}
});
}, (e) => console.error('HTTP error', e));
} }
} }
}, (e) => console.log(`Error while packaging: ${e.message}`)); }, (e) => console.log(`Error while packaging: ${e.message}`));

33
electron/release-scripts/macos.sh Normal file
View File

@ -0,0 +1,33 @@
#!/bin/bash -ex
if [ -z "${1}" ]
then
echo "Usage: ${0} RELEASE_VERSION"
fi
RELEASE_VERSION="${1}"
RELEASE_PATH="${HOME}/fchat-rising-dist/${RELEASE_VERSION}"
DIST_PATH="${HOME}/fchat-rising/electron/dist"
cd "/${HOME}/fchat-rising"
git checkout master
git pull
yarn
mkdir -p "${RELEASE_PATH}"
rm -rf "${DIST_PATH}"
cd electron
yarn build:dist
node pack.js
cp "${DIST_PATH}/F-Chat Rising Intel.dmg" "${RELEASE_PATH}/F-Chat-Rising-${RELEASE_VERSION}-macos-intel.dmg"
rm -f "${RELEASE_PATH}/F-Chat-Rising-${RELEASE_VERSION}-macos-intel.zip"
zip --junk-paths "${RELEASE_PATH}/F-Chat-Rising-${RELEASE_VERSION}-macos-intel.zip" "${DIST_PATH}/F-Chat Rising Intel.dmg"
cp "${DIST_PATH}/F-Chat Rising M1.dmg" "${RELEASE_PATH}/F-Chat-Rising-${RELEASE_VERSION}-macos-m1.dmg"
rm -f "${RELEASE_PATH}/F-Chat-Rising-${RELEASE_VERSION}-macos-m1.zip"
zip --junk-paths "${RELEASE_PATH}/F-Chat-Rising-${RELEASE_VERSION}-macos-m1.zip" "${DIST_PATH}/F-Chat Rising M1.dmg"