diff options
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 37 | ||||
| -rw-r--r-- | build.patch | 82 | ||||
| -rw-r--r-- | electron-ssr.sh | 6 |
4 files changed, 39 insertions, 93 deletions
@@ -1,12 +1,11 @@ pkgbase = electron-ssr pkgdesc = Shadowsocksr client using electron. pkgver = 0.2.6 - pkgrel = 5 + pkgrel = 6 url = https://github.com/erguotou520/electron-ssr arch = x86_64 license = MIT makedepends = yarn - makedepends = npm makedepends = hicolor-icon-theme depends = gtk2 depends = gconf @@ -25,8 +24,8 @@ pkgbase = electron-ssr source = electron-ssr.sh sha256sums = 87561b47486c2485c76136172c87f0df16ee9dc4cb85be7d77ce274328f92735 sha256sums = f96b27d2f826bf4e1c96f0154516c1e2cf07536f745128a9c2e5ec113cea6446 - sha256sums = 3ed8ee375e58f8f68f0d895862715b0b2efdc2a56cbbf9a5331aa9b2ca44377a - sha256sums = 5dfe00e15a2dbf461d0b48107b4a994ef9444801e5f9b7083a4b020e634db67f + sha256sums = e4dff411a6196ad0189a3102ac10aff024e189c350895c4a74c15588ea834723 + sha256sums = ae121e8a6995358b7e23881102e22b011a520f859b62675c129b5f99800bea0e source_x86_64 = electron-ssr-0.2.6.tar.gz::https://github.com/erguotou520/electron-ssr/archive/v0.2.6.tar.gz sha256sums_x86_64 = 9f2b0bdec4aa1fe9916981694f922b6e93e7fb80d2b2d5bda80c25d837c3fdda @@ -3,7 +3,7 @@ pkgname=electron-ssr pkgver=0.2.6 -pkgrel=5 +pkgrel=6 pkgdesc='Shadowsocksr client using electron.' arch=('x86_64') conflicts=("electron-ssr-git") @@ -12,7 +12,7 @@ url='https://github.com/erguotou520/electron-ssr' license=('MIT') depends=('gtk2' 'gconf' 'alsa-lib' 'libxss' 'nss' 'libxtst' 'electron') -makedepends=('yarn' 'npm' 'hicolor-icon-theme') +makedepends=('yarn' 'hicolor-icon-theme') optdepends=('libsodium: sodium crypto support') options=('!strip') @@ -25,8 +25,8 @@ source_x86_64=("$pkgname-$pkgver.tar.gz::https://github.com/erguotou520/electron sha256sums=('87561b47486c2485c76136172c87f0df16ee9dc4cb85be7d77ce274328f92735' 'f96b27d2f826bf4e1c96f0154516c1e2cf07536f745128a9c2e5ec113cea6446' - 'd70d66809bfa2e253b964209a9eedd862f3c13dad373be28ec351dc51f1b4f28' - '5dfe00e15a2dbf461d0b48107b4a994ef9444801e5f9b7083a4b020e634db67f') + 'e4dff411a6196ad0189a3102ac10aff024e189c350895c4a74c15588ea834723' + 'ae121e8a6995358b7e23881102e22b011a520f859b62675c129b5f99800bea0e') sha256sums_x86_64=('9f2b0bdec4aa1fe9916981694f922b6e93e7fb80d2b2d5bda80c25d837c3fdda') prepare() { @@ -34,7 +34,6 @@ prepare() { dir=$srcdir/$pkgname-$pkgver/ cd $dir patch -Np1 -i "$srcdir/build.patch" - sed -i '/\"electron\":/d' package.json } build() { @@ -42,29 +41,27 @@ build() { # Build Package yarn - npm run build + yarn run build } package() { - # Install - cd $srcdir/$pkgname-$pkgver/dist/electron - find * -type f -exec install -Dm644 {} "${pkgdir}/opt/electron-ssr/{}" \; - install -Dm755 $srcdir/electron-ssr.sh $pkgdir/opt/$pkgname/electron-ssr - mkdir -p $pkgdir/usr/bin - ln -s /opt/$pkgname/electron-ssr $pkgdir/usr/bin/electron-ssr + # Make dirs + mkdir -p "$pkgdir/usr/share/applications" + mkdir -p "$pkgdir/usr/share/electron-ssr" + mkdir -p "$pkgdir/usr/bin" + mkdir -p "$pkgdir/usr/share/icons/hicolor" - # Install modules - cd $srcdir/$pkgname-$pkgver/node_modules - find * -type f -exec install -Dm644 {} "${pkgdir}/opt/electron-ssr/node_modules/{}" \; - cd "${pkgdir}/opt/electron-ssr/node_modules" - [ -e ./electron ] && rm -r ./electron + # Install + cd "$srcdir/$pkgname-$pkgver/build/linux-unpacked/resources" + install -Dm644 app.asar "$pkgdir/usr/share/electron-ssr/app.asar" + install -Dm755 "$srcdir/electron-ssr.sh" "$pkgdir/usr/bin/electron-ssr" # Install Other things - install -Dm644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE - install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop + install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" # Install icons for i in 16x16 24x24 32x32 48x48 64x64 96x96 128x128 256x256; do - install -Dm644 $srcdir/$pkgname-$pkgver/build/icons/$i.png $pkgdir/usr/share/icons/hicolor/$i/apps/$pkgname.png + install -Dm644 "$srcdir/$pkgname-$pkgver/build/icons/$i.png" "$pkgdir/usr/share/icons/hicolor/$i/apps/$pkgname.png" done } diff --git a/build.patch b/build.patch index 1c2063eab2fb..2a4b626f9d24 100644 --- a/build.patch +++ b/build.patch @@ -1,67 +1,3 @@ -diff -ura electron-ssr-0.2.6/.electron-vue/build.js electron-ssr-0.2.6-new/.electron-vue/build.js ---- electron-ssr-0.2.6/.electron-vue/build.js 2019-01-19 23:15:33.631275262 +0800 -+++ electron-ssr-0.2.6-new/.electron-vue/build.js 2019-01-19 23:15:37.908378989 +0800 -@@ -46,10 +46,6 @@ - process.stdout.write('\x1B[2J\x1B[0f') - console.log(`\n\n${results}`) - console.log(`${okayLog}take it away ${chalk.yellow('`electron-builder`')}\n`) -- // 打包发布版本 -- release().then(function () { -- process.exit() -- }) - }) - - pack(mainConfig).then(result => { - -diff -ura electron-ssr-0.2.6/src/main/index.js electron-ssr-0.2.6-new/src/main/index.js ---- electron-ssr-0.2.6/src/main/index.js 2018-12-26 18:29:32.000000000 +0800 -+++ electron-ssr-0.2.6-new/src/main/index.js 2019-01-20 15:08:44.166253824 +0800 -@@ -28,7 +28,12 @@ - } - // 如果是通过链接打开的应用，则添加记录 - if (argv[1]) { -- const configs = loadConfigsFromString(argv[1]) -+ let configs = null -+ if (argv[0] !== 'electron-ssr') { -+ configs = loadConfigsFromString(argv[2]) -+ } else { -+ configs = loadConfigsFromString(argv[1]) -+ } - if (configs.length) { - addConfigs(configs) - } - -diff -ura electron-ssr-0.2.6/src/main/bootstrap.js electron-ssr-0.2.6-new/src/main/bootstrap.js ---- electron-ssr-0.2.6/src/main/bootstrap.js 2018-12-26 18:29:32.000000000 +0800 -+++ electron-ssr-0.2.6-new/src/main/bootstrap.js 2019-01-21 22:10:10.157584848 +0800 -@@ -36,6 +36,8 @@ - logger.error(`Unhandled Rejection at: Promise ${p}, reason: ${reason}`) - }) - -+app.setPath('userData', path.join(app.getPath('appData'), 'electron-ssr')) -+app.setVersion('0.2.6') - // 应用配置存储目录 - export const appConfigDir = app.getPath('userData') - // 应用配置存储路径 - -diff -ura electron-ssr-0.2.6/src/main/logger.js electron-ssr-0.2.6-new/src/main/logger.js ---- electron-ssr-0.2.6/src/main/logger.js 2018-12-26 18:29:32.000000000 +0800 -+++ electron-ssr-0.2.6-new/src/main/logger.js 2019-01-21 22:29:14.657347146 +0800 -@@ -3,11 +3,13 @@ - import { join } from 'path' - import { ensureDirSync } from 'fs-extra' - import * as Sentry from '@sentry/electron' -+import path from 'path' - - if (process.env.NODE_ENV === 'production') { - Sentry.init({ dsn: 'https://39bffe7372d14000bd5d30e50a27c388@sentry.io/1359858' }) - } - -+app.setPath('userData', path.join(app.getPath('appData'), 'electron-ssr')) - const userPath = app.getPath('userData') - const logFolder = join(userPath, 'logs') - ensureDirSync(logFolder) - diff -ura electron-ssr-0.2.6/src/main/index.js electron-ssr-0.2.6-new/src/main/index.js --- electron-ssr-0.2.6/src/main/index.js 2019-04-12 15:05:00.420443178 +0800 +++ electron-ssr-0.2.6-new/src/main/index.js 2019-04-12 15:06:38.004324260 +0800 @@ -90,3 +26,21 @@ diff -ura electron-ssr-0.2.6/src/main/index.js electron-ssr-0.2.6-new/src/main/i bootstrap.then(() => { createWindow() + +diff -ura electron-ssr-0.2.6/.electron-vue/release.js electron-ssr-0.2.6-new/.electron-vue/release. +js +--- electron-ssr-0.2.6/.electron-vue/release.js 2019-01-28 15:55:46.000000000 +0800 ++++ electron-ssr-0.2.6-new/.electron-vue/release.js 2019-04-23 16:36:49.169513672 +0800 +@@ -112,11 +112,7 @@ + category: 'Development', + synopsis: pkg.description, + target: [ +- 'deb', +- 'rpm', +- 'tar.gz', +- 'pacman', +- 'appImage' ++ 'dir' + ], + desktop: { + Name: 'electron-ssr', diff --git a/electron-ssr.sh b/electron-ssr.sh index e79cc55207d2..470681cd6a32 100644 --- a/electron-ssr.sh +++ b/electron-ssr.sh @@ -1,6 +1,2 @@ #!/bin/bash -if [ -z "$ELECTRON_SSR_SCALE_FACTOR" ] ; then - exec electron /opt/electron-ssr/main.js "$@" -else - exec electron /opt/electron-ssr/main.js "$@" --force-device-scale-factor="$ELECTRON_SSR_SCALE_FACTOR" -fi
\ No newline at end of file +exec electron /usr/share/electron-ssr/app.asar "$@" |