electerm 1.37.106 → 1.37.121

package/README.md

@@ -48,6 +48,7 @@ Online demo: [https://electerm-demo.html5beta.com](https://electerm-demo.html5be
 
 ## Download
 
+- [Homepage](https://electerm.html5beta.com)
 - [sourceforge](https://sourceforge.net/projects/electerm.mirror/files/)
 - [github releases](https://github.com/electerm/electerm/releases)
 
@@ -166,8 +167,12 @@ npm run test
 # Build linux only with -l
 npm i
 npm run prepare-build
-npm run release -l
+./node_modules/.bin/electron-builder --linux tar.gz
+# or replace tar.gz to rpm/deb/AppImage
 # check dist/ folder
+
+# build for linux arm/
+./node_modules/.bin/electron-builder --linux --arm64
 ```
 
 ## Use

package/npm/install.js

@@ -7,8 +7,13 @@ const { resolve } = require('path')
 const { exec, rm, mv } = require('shelljs')
 const rp = require('phin').promisified
 const download = require('download')
-const isWin = os.platform() === 'win32'
-const isMac = os.platform() === 'darwin'
+const plat = os.platform()
+const isWin = plat === 'win32'
+const isMac = plat === 'darwin'
+const isLinux = plat === 'linux'
+const arch = os.arch()
+const isArm = arch === 'arm'
+const isArm64 = arch === 'arm64'
 const { homepage } = require('../package.json')
 const releaseInfoUrl = `${homepage}/data/electerm-github-release.json?_=${+new Date()}`
 const versionUrl = `${homepage}/version.html?_=${+new Date()}`
@@ -42,12 +47,12 @@ function getReleaseInfo (filter) {
     })
 }
 
-async function runLinux () {
+async function runLinux (name, nameWithExt) {
   const ver = await getVer()
-  const target = resolve(__dirname, `../electerm-${ver.replace('v', '')}-linux-x64`)
+  const target = resolve(__dirname, `../electerm-${ver.replace('v', '')}-${name}`)
   const targetNew = resolve(__dirname, '../electerm')
   exec(`rm -rf ${target} ${targetNew}`)
-  const releaseInfo = await getReleaseInfo(r => /linux-x64\.tar\.gz/.test(r.name))
+  const releaseInfo = await getReleaseInfo(r => r.name.includes(nameWithExt))
   await down(releaseInfo.browser_download_url)
   // await down('http://192.168.0.67:7500/electerm-0.16.1.tar.gz')
   exec(`mv ${target} ${targetNew}`)
@@ -81,6 +86,10 @@ if (isWin) {
   runWin()
 } else if (isMac) {
   runMac()
+} else if (isLinux && isArm) {
+  runLinux('linux-armv7l', 'linux-armv7l.tar.gz')
+} else if (isLinux && isArm64) {
+  runLinux('linux-arm64', 'linux-arm64.tar.gz')
 } else {
-  runLinux()
+  throw new Error(`platform: ${plat}, arch: ${arch} not supported`)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electerm",
-  "version": "1.37.106",
+  "version": "1.37.121",
   "description": "Terminal/ssh/telnet/serialport/sftp client(linux, mac, win)",
   "main": "app.js",
   "bin": "npm/electerm",
@@ -17,8 +17,6 @@
     "postpublish": "node build/bin/postpublish",
     "prepare-file": "node build/bin/prepare",
     "prepare-test": "PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 npm i -E playwright@1.28.1 --no-save && npm i -E @playwright/test@1.28.1 --no-save",
-    "output": "./node_modules/.bin/electron-builder",
-    "release": "npm run pre-test && npm run output",
     "postinstall": "node build/bin/post-install",
     "lint": "./node_modules/.bin/standard --verbose",
     "fix": "./node_modules/.bin/standard --fix",
@@ -57,7 +55,7 @@
   "devDependencies": {
     "@ant-design/icons": "5.2.5",
     "@electerm/electerm-resource": "1.3.7",
-    "@electron/rebuild": "^3.3.0",
+    "@electron/rebuild": "^3.4.1",
     "@types/node": "20.5.7",
     "@vitejs/plugin-react": "4.2.1",
     "antd": "5.12.2",
@@ -66,7 +64,7 @@
     "cross-env": "7.0.3",
     "dotenv": "16.3.1",
     "electron": "26.2.4",
-    "electron-builder": "24.6.4",
+    "electron-builder": "24.9.1",
     "eventemitter3": "5.0.1",
     "filesize": "10.0.7",
     "filesize-parser": "1.5.0",