summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Lisin2020-03-03 11:56:06 +0100
committerMatthias Lisin2020-03-03 11:56:06 +0100
commitf20096c97a29afc00eb1865ec389b8e9c0efa5ba (patch)
treee13c2bd9696ff228b96e26a6849147dfe12e25c2
parent2bf258486806d66b22804c170e71b67ce428a1df (diff)
downloadaur-f20096c97a29afc00eb1865ec389b8e9c0efa5ba.tar.gz
upgpkg: ubports-installer-git
Electron6
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD13
-rw-r--r--disable-update-check.patch24
-rwxr-xr-xubports-installer2
4 files changed, 9 insertions, 38 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 92161afb824..3e8e1ce40b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ubports-installer-git
pkgdesc = A simple tool to install Ubuntu Touch on UBports devices
- pkgver = 0.4.5_beta.r0.g5ce9c51
+ pkgver = 0.4.14_beta.r4.g9f0fde4
pkgrel = 1
url = https://github.com/ubports/ubports-installer
arch = any
@@ -11,18 +11,16 @@ pkgbase = ubports-installer-git
makedepends = npm
depends = android-tools
depends = android-udev
- depends = electron4
+ depends = electron6
provides = ubports-installer
conflicts = ubports-installer
source = ubports-installer-git::git+https://github.com/ubports/ubports-installer.git
source = ubports-installer
source = ubports-installer.desktop
- source = disable-update-check.patch
source = use-system-tools.patch
sha512sums = SKIP
- sha512sums = 478766bca96e64cb13b86003113e33eba74139e5a0d56687ff0647e4d2356639249c9f4054c5c3741fec697c624980dd1507925702f4865370ec9a20f766720a
+ sha512sums = 50b114735cbe7cdde45dff5ae18c3e081f45d61045177a97b50b9525355b02e1a6c435996ccfe5503451ceffa027882abb5133585acc01dc5445bb1501b04f0a
sha512sums = efb0da575db03326f56a8bb589f3f5f543a4ae23b471658555bb030bcc1c1625ba2aafd15f26fac41425b3b0bde4cf176740d92aafd5853d5ce1da2b946686e8
- sha512sums = 42d977dabe003cc4001e75a7dd782090bd7218c8b5270e820d922b3ca206e58669de9e0d9bc4056839baf1b363922e2a789626642959a31070d3160e51c151cf
sha512sums = 4655eadabf03185b811e6a9df4569a23b459ee3ea4b64801aa445c3cfb7443e88a1c2de99050d4ec145c2936c58afdb4dd7767cb3ab00be4e8f969578bc86183
pkgname = ubports-installer-git
diff --git a/PKGBUILD b/PKGBUILD
index d52f836a4e2..6a391229701 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,22 @@
# Maintainer: Matthias Lisin <ml@visu.li>
pkgname=ubports-installer-git
-pkgver=0.4.5_beta.r0.g5ce9c51
+pkgver=0.4.14_beta.r4.g9f0fde4
pkgrel=1
pkgdesc='A simple tool to install Ubuntu Touch on UBports devices'
arch=(any)
url='https://github.com/ubports/ubports-installer'
license=('GPL3')
-depends=('android-tools' 'android-udev' 'electron4')
+depends=('android-tools' 'android-udev' 'electron6')
makedepends=('git' 'jq' 'moreutils' 'npm')
provides=('ubports-installer')
conflicts=('ubports-installer')
source=("$pkgname::git+${url}.git"
ubports-installer
ubports-installer.desktop
- disable-update-check.patch
use-system-tools.patch)
sha512sums=('SKIP'
- '478766bca96e64cb13b86003113e33eba74139e5a0d56687ff0647e4d2356639249c9f4054c5c3741fec697c624980dd1507925702f4865370ec9a20f766720a'
+ '50b114735cbe7cdde45dff5ae18c3e081f45d61045177a97b50b9525355b02e1a6c435996ccfe5503451ceffa027882abb5133585acc01dc5445bb1501b04f0a'
'efb0da575db03326f56a8bb589f3f5f543a4ae23b471658555bb030bcc1c1625ba2aafd15f26fac41425b3b0bde4cf176740d92aafd5853d5ce1da2b946686e8'
- '42d977dabe003cc4001e75a7dd782090bd7218c8b5270e820d922b3ca206e58669de9e0d9bc4056839baf1b363922e2a789626642959a31070d3160e51c151cf'
'4655eadabf03185b811e6a9df4569a23b459ee3ea4b64801aa445c3cfb7443e88a1c2de99050d4ec145c2936c58afdb4dd7767cb3ab00be4e8f969578bc86183')
pkgver() {
@@ -27,14 +25,13 @@ pkgver() {
}
prepare() {
- local dist=/usr/lib/electron4
+ local dist=/usr/lib/electron6
local version="$(sed 's/^v//' $dist/version)"
cd "$pkgname"
for i in ${source[@]}; do
case ${i%::*} in
*.patch)
- msg2 "Applying ${i}"
patch -N -p1 -i "$srcdir/${i}"
;;
esac
@@ -51,7 +48,7 @@ prepare() {
# Removing local references
for module in he sshpk; do
local target="node_modules/${module}/package.json"
- msg2 "Removing local references from ${target}"
+ echo "Removing local references from ${target}"
jq 'del(.man)' "$target" | sponge "$target"
done
}
diff --git a/disable-update-check.patch b/disable-update-check.patch
deleted file mode 100644
index 449a44aa6c6..00000000000
--- a/disable-update-check.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ura package.orig/src/main.js package.new/src/main.js
---- package.orig/src/main.js 2019-11-03 17:16:52.891370653 +0100
-+++ package.new/src/main.js 2019-11-03 17:17:32.026472647 +0100
-@@ -390,20 +390,6 @@
- });
- });
-
-- // Task we need only on the first start
-- mainWindow.webContents.once("did-finish-load", () => {
-- utils
-- .getUpdateAvailable()
-- .then(() => {
-- utils.log.info(
-- "This is not the latest version of the UBports Installer! Please update: https://devices.ubuntu-touch.io/installer/" +
-- (global.packageInfo.package ? global.packageInfo.package : "")
-- );
-- mainWindow.webContents.send("user:update-available");
-- })
-- .catch(() => {}); // Ignore errors, since this is non-essential
-- });
--
- mainWindow.loadURL(
- url.format({
- pathname: path.join(__dirname, "html/index.pug"),
diff --git a/ubports-installer b/ubports-installer
index e62c678c6fd..01fbec3aeae 100755
--- a/ubports-installer
+++ b/ubports-installer
@@ -1,2 +1,2 @@
#!/bin/sh
-exec electron4 /usr/share/ubports-installer/app.asar "$@"
+exec electron6 /usr/share/ubports-installer/app.asar "$@"