summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Lisin2019-03-23 21:32:15 +0100
committerMatthias Lisin2019-03-23 21:32:15 +0100
commit7fe62f849060e5261cc78f634a4303d2d3956534 (patch)
treed03a534901cd8ebd45ebb5f09972acd67d45c93e
parentc2a7ed3a4f4658dc633e01788c048a521f3c7d2f (diff)
downloadaur-7fe62f849060e5261cc78f634a4303d2d3956534.tar.gz
updpkg: ubports-installer-git 0.2.1_beta.r0.*
Adjusting patches. Sadly we are forced to download the electron :( I'm sorry, this is JS.
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD24
-rw-r--r--remove-electron-sudo.patch (renamed from rootless.patch)16
-rw-r--r--remove-update-check.patch22
-rwxr-xr-xubports-installer2
5 files changed, 48 insertions, 28 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 65abd6ab7de..93eb4152dc4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ubports-installer-git
pkgdesc = A simple tool to install Ubuntu Touch on UBports devices
- pkgver = 0.1.21_beta.r23.ga569e6b
- pkgrel = 2
+ pkgver = 0.2.1_beta.r0.g1bea06f
+ pkgrel = 1
url = https://github.com/ubports/ubports-installer
arch = any
license = GPL3
@@ -16,11 +16,13 @@ pkgbase = ubports-installer-git
source = ubports-installer-git::git+https://github.com/ubports/ubports-installer.git
source = ubports-installer
source = ubports-installer.desktop
- source = rootless.patch
+ source = remove-electron-sudo.patch
+ source = remove-update-check.patch
sha512sums = SKIP
- sha512sums = 51280df65c791b745aa06c689cbb0830ba48b69ebcb5ebfc96e4f9917c3da49d4aca6468dbac4bf1221988105f682861c6b76784a877b875ddaa29942e0ef1a2
+ sha512sums = 80b149a18a0e3effc3eea25674689e226d13671806953af58b8db247f5342a74df761d9dcb2f5015a6dd7342b461e6d6d60c4a883ea8346dee388552b8cdac0f
sha512sums = 5370dae98ea52ef6d1a6d35cc15774687457836cc7a74538d32279617db329f215989863f15ed46d3aba7e384d703161a1cf6ae92101d88c8efa1445464bea59
- sha512sums = 5e1a99f7bde3fd7b5b6b22d771421520e360f5f133fdc78ed35eea03969aa0f379df1ab720c792fd2c7155e92e4ccb70db9e77732ecedbb60e4ab294c8ea7107
+ sha512sums = 419c08304996aee1cb05dc59d1b88900bff77711ad58d7d627912c90337ea9d4af98c25e516dd5ecc2c418fdacc2ec043714efc19553d1427e090e6f001c2ec7
+ sha512sums = d3afd645a6f0c6addd824d1b708501b5f6606bcba848c175ce19d14f43b07baebf5c63045e56f5a62cba543eda32afc5df79c3e35ae5e8dc68f0e89658b3833b
pkgname = ubports-installer-git
diff --git a/PKGBUILD b/PKGBUILD
index c6401a5bc33..06e6dbdf7d3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Matthias Lisin <ml@visu.li>
pkgname=ubports-installer-git
-pkgver=0.1.21_beta.r23.ga569e6b
-pkgrel=2
+pkgver=0.2.1_beta.r0.g1bea06f
+pkgrel=1
pkgdesc='A simple tool to install Ubuntu Touch on UBports devices'
arch=(any)
url='https://github.com/ubports/ubports-installer'
@@ -13,11 +13,13 @@ conflicts=('ubports-installer')
source=("$pkgname::git+${url}.git"
ubports-installer
ubports-installer.desktop
- rootless.patch)
+ remove-electron-sudo.patch
+ remove-update-check.patch)
sha512sums=('SKIP'
- '51280df65c791b745aa06c689cbb0830ba48b69ebcb5ebfc96e4f9917c3da49d4aca6468dbac4bf1221988105f682861c6b76784a877b875ddaa29942e0ef1a2'
+ '80b149a18a0e3effc3eea25674689e226d13671806953af58b8db247f5342a74df761d9dcb2f5015a6dd7342b461e6d6d60c4a883ea8346dee388552b8cdac0f'
'5370dae98ea52ef6d1a6d35cc15774687457836cc7a74538d32279617db329f215989863f15ed46d3aba7e384d703161a1cf6ae92101d88c8efa1445464bea59'
- '5e1a99f7bde3fd7b5b6b22d771421520e360f5f133fdc78ed35eea03969aa0f379df1ab720c792fd2c7155e92e4ccb70db9e77732ecedbb60e4ab294c8ea7107')
+ '419c08304996aee1cb05dc59d1b88900bff77711ad58d7d627912c90337ea9d4af98c25e516dd5ecc2c418fdacc2ec043714efc19553d1427e090e6f001c2ec7'
+ 'd3afd645a6f0c6addd824d1b708501b5f6606bcba848c175ce19d14f43b07baebf5c63045e56f5a62cba543eda32afc5df79c3e35ae5e8dc68f0e89658b3833b')
pkgver() {
cd "$pkgname"
@@ -27,22 +29,26 @@ pkgver() {
prepare() {
local cache="$srcdir/npm-cache"
local dist=/usr/lib/electron
+ local version="$(sed s/^v// $dist/version)"
- patch -p1 -d "$pkgname" < rootless.patch
+ for i in *.patch; do
+ patch -p1 -d "$pkgname" < "$i"
+ done
cd "$pkgname"
jq '.electronDist = $dist | .electronVersion = $version' \
--arg dist "$dist" \
- --arg version "$(sed s/^v// $dist/version)" \
+ --arg version "$version" \
buildconfig-generic.json > new-buildconfig.json
mv new-buildconfig.json buildconfig-generic.json
- npm uninstall --no-audit --cache "$cache" electron{,-packager,-sudo,-view-renderer} spectron
+ npm uninstall --no-audit --cache "$cache" electron{-packager,-sudo,-view-renderer} spectron
+ npm install --no-audit --cache "$cache" electron@"$version"
}
build() {
cd "$pkgname"
- node build.js --build-to-dir --linux --no-platform-tools
+ node build.js --os linux --package dir --no-platform-tools
}
package() {
diff --git a/rootless.patch b/remove-electron-sudo.patch
index 9a17aa176e0..925fa080493 100644
--- a/rootless.patch
+++ b/remove-electron-sudo.patch
@@ -1,7 +1,7 @@
diff -ura package.orig/src/utils.js package.new/src/utils.js
---- package.orig/src/utils.js 2019-03-02 03:00:07.393462552 +0100
-+++ package.new/src/utils.js 2019-03-02 02:59:53.770016930 +0100
-@@ -17,7 +17,6 @@
+--- package.orig/src/utils.js 2019-03-23 21:06:10.110844584 +0100
++++ package.new/src/utils.js 2019-03-23 21:06:28.024347309 +0100
+@@ -16,7 +16,6 @@
const tmp = require('tmp');
const exec = require('child_process').exec;
const cp = require('child_process');
@@ -9,13 +9,3 @@ diff -ura package.orig/src/utils.js package.new/src/utils.js
const winston = require('winston');
const getos = require('getos');
const commandExistsSync = require('command-exists').sync;
-@@ -387,8 +386,7 @@
- }
-
- var needRoot = () => {
-- if ((os.platform() === "win32") || isSnap()) return false;
-- return !process.env.SUDO_UID
-+ return false
- }
-
- var ensureRoot = (m) => {
diff --git a/remove-update-check.patch b/remove-update-check.patch
new file mode 100644
index 00000000000..6bd23c1cb42
--- /dev/null
+++ b/remove-update-check.patch
@@ -0,0 +1,22 @@
+diff -ura package.orig/src/html/scripts/ui.pug package.new/src/html/scripts/ui.pug
+--- package.orig/src/html/scripts/ui.pug 2019-03-23 21:06:10.110844584 +0100
++++ package.new/src/html/scripts/ui.pug 2019-03-23 21:17:27.400580327 +0100
+@@ -224,18 +224,3 @@
+ if (process.platform === "win32") {
+ modals.show('windows-drivers');
+ }
+-
+- utils.getUpdateAvailable().then((updateAvailable) => {
+- if(updateAvailable) {
+- utils.log.warn("This is not the latest stable release!")
+- if (utils.isSnap()) {
+- $("#snap-update-instructions").show();
+- $("#btn-update-installer").hide();
+- } else {
+- $("#generic-update-instructions").show();
+- }
+- modals.show('new-update');
+- } else {
+- utils.log.debug("Running latest stable version.");
+- }
+- });
diff --git a/ubports-installer b/ubports-installer
index c6ba63cb2ca..81153b38ed2 100755
--- a/ubports-installer
+++ b/ubports-installer
@@ -1,3 +1,3 @@
#!/bin/sh
-exec electron /usr/share/ubports-installer/app.asar
+exec electron /usr/share/ubports-installer/app.asar "$@" --no-root