summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD23
-rw-r--r--hikari-field-client2
-rw-r--r--inject-main.js13
4 files changed, 38 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1e4e6213b6b2..8d7fb94cfb23 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = hikari-field-client-bin
pkgdesc = Hikari Field Client For Linux.
- pkgver = 1.1.1
+ pkgver = 1.1.4
pkgrel = 1
epoch = 1
url = https://store.hikarifield.co.jp/client
@@ -8,15 +8,17 @@ pkgbase = hikari-field-client-bin
license = unknown
makedepends = asar
makedepends = p7zip
- depends = electron13
+ depends = electron13-bin
options = !strip
- source = HIKARI-FIELD-CLIENT-Setup-1.1.1.zip::https://client.hikarifield.co.jp/release/HIKARI-FIELD-CLIENT-Setup-1.1.1.zip
+ source = HIKARI-FIELD-CLIENT-Setup-1.1.4.zip::https://client.hikarifield.co.jp/release/HIKARI-FIELD-CLIENT-Setup-1.1.4.zip
source = hikari-field-client.desktop
source = hikari-field-client.svg
source = hikari-field-client
- sha256sums = b98f2aec774559d20f71da5bd3ac2dfaddd955df6947b44dc3500d4a52e5b86d
+ source = inject-main.js
+ sha256sums = 24d9777fcd45187abb29bd1c8420b0097eb57f2f768decf07faafd0ed7998cf1
sha256sums = 2b556b725ae33587fc5ac1d53f1ab586b5f9c089dd765d9875e0c6c3971a4f55
sha256sums = 3a574b7d3bcfe2e4fbaacfd16a3b43dafae7decbc2f0030c56104cfbbbf75c7e
- sha256sums = b8a71c44ec6dc48b00e0f53fc9482b449464e98dd87d5a3218fba01a9336ffbe
+ sha256sums = 15b3debdb4472c6a2dae20c2a48f032580a56df509f4c19691bbbd0a5a6d228b
+ sha256sums = 2c8d95c7996b7b82dc83d80b198629196349df5437d560f8d2127b33f1545e67
pkgname = hikari-field-client-bin
diff --git a/PKGBUILD b/PKGBUILD
index f8ce9a8e70d9..7772dce56adb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
# Maintainer: msojocs <jiyecafe@gmail.com>
-_hf_ver="1.1.1"
+_hf_ver="1.1.4"
_hf_url="https://client.hikarifield.co.jp/release/HIKARI-FIELD-CLIENT-Setup-${_hf_ver}.zip"
_hf_sha265="b98f2aec774559d20f71da5bd3ac2dfaddd955df6947b44dc3500d4a52e5b86d"
+# _electron_version="13.4.0"
pkgname=hikari-field-client-bin
pkgver="${_hf_ver}" # 主版本号
@@ -15,18 +16,21 @@ arch=("any")
url="https://store.hikarifield.co.jp/client"
license=('unknown')
-depends=('electron13')
+depends=('electron13-bin')
makedepends=('asar' 'p7zip')
source=(
"HIKARI-FIELD-CLIENT-Setup-${_hf_ver}.zip::${_hf_url}"
+ # "electron-${_electron_version}.zip::https://npmmirror.com/mirrors/electron/${_electron_version}/electron-v${_electron_version}-linux-x64.zip"
"hikari-field-client.desktop"
"hikari-field-client.svg"
"hikari-field-client"
+ "inject-main.js"
)
-sha256sums=('b98f2aec774559d20f71da5bd3ac2dfaddd955df6947b44dc3500d4a52e5b86d'
+sha256sums=('24d9777fcd45187abb29bd1c8420b0097eb57f2f768decf07faafd0ed7998cf1'
'2b556b725ae33587fc5ac1d53f1ab586b5f9c089dd765d9875e0c6c3971a4f55'
'3a574b7d3bcfe2e4fbaacfd16a3b43dafae7decbc2f0030c56104cfbbbf75c7e'
- 'b8a71c44ec6dc48b00e0f53fc9482b449464e98dd87d5a3218fba01a9336ffbe')
+ '15b3debdb4472c6a2dae20c2a48f032580a56df509f4c19691bbbd0a5a6d228b'
+ '2c8d95c7996b7b82dc83d80b198629196349df5437d560f8d2127b33f1545e67')
options=('!strip')
prepare(){
@@ -41,8 +45,15 @@ build(){
echo "build"
cd tmp/hf/resources
asar e app.asar app
- # !n.app.isPackaged
- sed -i 's#!n.app.isPackaged#n.app.isPackaged#' app/build/main.js
+
+ cp "$srcdir/inject-main.js" "app/build/temp.js"
+ cat app/build/main.js >> "app/build/temp.js"
+ rm -rf "app/build/main.js"
+ mv "app/build/temp.js" "app/build/main.js"
+ # 处理界面在小分辨率下显示不完整的问题
+ sed -i 's#idth:1280,#idth:1000,#g' app/build/main.js
+ sed -i 's#eight:720#eight:500#g' app/build/main.js
+
asar p app app.asar
rm -rf app
}
diff --git a/hikari-field-client b/hikari-field-client
index 7d28ce21f1c4..9feb805fefb6 100644
--- a/hikari-field-client
+++ b/hikari-field-client
@@ -1,2 +1,2 @@
#!/bin/bash
-electron13 /usr/share/hikari-field-client-bin/app.asar \ No newline at end of file
+ELECTRON_FORCE_IS_PACKAGED=true electron13 /usr/share/hikari-field-client-bin/app.asar --disable-gpu --no-sandbox \ No newline at end of file
diff --git a/inject-main.js b/inject-main.js
new file mode 100644
index 000000000000..4650d680ece7
--- /dev/null
+++ b/inject-main.js
@@ -0,0 +1,13 @@
+const { app } = require("electron");
+const pkgHack = {
+ idx: 0,
+ data: [true, true, true, true, true, true],
+};
+Object.defineProperty(app, "isPackaged", {
+ get() {
+ let ret = pkgHack.data[pkgHack.idx++];
+ if (ret === undefined) ret = true;
+ console.log("get isPackaged", ret);
+ return true;
+ },
+});