summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO18
-rw-r--r--01-disable-update-check.patch20
-rw-r--r--02-never-udev.patch12
-rw-r--r--03-electrondist.patch11
-rw-r--r--PKGBUILD33
-rwxr-xr-xubports-installer2
6 files changed, 18 insertions, 78 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a4652c310c22..69bec6ca30ac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,25 @@
pkgbase = ubports-installer-git
pkgdesc = A simple tool to install Ubuntu Touch on UBports devices
- pkgver = 0.8.2_beta.r0.ga55cc1a
+ pkgver = 0.9.8_beta.r3.g1756231
pkgrel = 1
url = https://github.com/ubports/ubports-installer
- arch = any
+ arch = x86_64
license = GPL3
makedepends = git
+ makedepends = nodejs
makedepends = npm
depends = android-tools
depends = android-udev
- depends = electron
+ depends = dbus
+ depends = glib2
+ depends = heimdall
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 = 01-disable-update-check.patch
- source = 02-never-udev.patch
- source = 03-electrondist.patch
sha256sums = SKIP
- sha256sums = e3167aa1469a33d1eca4dae377ed51675bea08e61e6d17f94f83a241538be56b
+ sha256sums = 461694d8ebce4d14e27be15d278ab1c1610c998962a94a7aaff1c64886f85dbe
sha256sums = 7f59cb66ab7e59caeff93f697e47f26f43a9a221258f4d89dee580e41dd7a39a
- sha256sums = f5a47dd84c2ce46528385a673d93e465132a80a5a72de5b4cf41e055f9f60fe4
- sha256sums = a9d899eaf4e8a004c20d7d9ff6af696aa9cd5602e5e95583f4fe27ecaa7aa03f
- sha256sums = 768fcea52f63fed0bebb61861437db5f7e1f00358ad594c8d5593adc43a0f0c0
pkgname = ubports-installer-git
-
diff --git a/01-disable-update-check.patch b/01-disable-update-check.patch
deleted file mode 100644
index 70994acc6fd2..000000000000
--- a/01-disable-update-check.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ura package.orig/src/main.js package.new/src/main.js
---- package.orig/src/main.js 2020-12-22 21:55:07.535806928 +0100
-+++ package.new/src/main.js 2020-12-22 21:58:31.700431931 +0100
-@@ -66,16 +66,6 @@
- // Tasks we need for every start and restart
- mainWindow.webContents.on("did-finish-load", () => core.prepare(cli.file));
-
-- // Task we need only on the first start
-- mainWindow.webContents.once("did-finish-load", () => {
-- updater
-- .isOutdated()
-- .then(updateUrl => {
-- if (updateUrl) mainEvent.emit("user:update-available", updateUrl);
-- })
-- .catch(e => log.debug(e)); // Ignore errors, since this is non-essential
-- });
--
- mainWindow.loadURL(
- url.format({
- pathname: path.join(__dirname, "html/index.html"),
diff --git a/02-never-udev.patch b/02-never-udev.patch
deleted file mode 100644
index 68bae214bb47..000000000000
--- a/02-never-udev.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ura package.orig/src/lib/settings.js package.new/src/lib/settings.js
---- package.orig/src/lib/settings.js 2020-12-22 21:55:07.535806928 +0100
-+++ package.new/src/lib/settings.js 2020-12-22 22:02:04.930637631 +0100
-@@ -39,7 +39,7 @@
- },
- udev: {
- type: "boolean",
-- default: false
-+ default: true
- },
- windowsDrivers: {
- type: "boolean",
diff --git a/03-electrondist.patch b/03-electrondist.patch
deleted file mode 100644
index 6f9487677499..000000000000
--- a/03-electrondist.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ura package.orig/build.js package.new/build.js
---- package.orig/build.js 2020-11-04 00:15:31.378571293 +0100
-+++ package.new/build.js 2020-11-04 00:28:01.100273854 +0100
-@@ -62,6 +62,7 @@
- productName: "ubports-installer",
- copyright: "Copyright © 2017-2020 UBports Foundation",
- artifactName: "${name}_${version}_${os}_${arch}.${ext}",
-+ electronDist: "/usr/lib/electron",
- publish: [],
- files: [
- "src/**/*",
diff --git a/PKGBUILD b/PKGBUILD
index b25adf0bc9af..52f40e413901 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,21 @@
# Maintainer: ml <>
pkgname=ubports-installer-git
-pkgver=0.8.2_beta.r0.ga55cc1a
+pkgver=0.9.8_beta.r3.g1756231
pkgrel=1
pkgdesc='A simple tool to install Ubuntu Touch on UBports devices'
-arch=('any')
+arch=('x86_64')
url='https://github.com/ubports/ubports-installer'
license=('GPL3')
-depends=('android-tools' 'android-udev' 'electron')
-makedepends=('git' 'npm')
+depends=('android-tools' 'android-udev' 'dbus' 'glib2' 'heimdall')
+makedepends=('git' 'nodejs' 'npm')
provides=('ubports-installer')
conflicts=('ubports-installer')
source=("$pkgname::git+$url.git"
ubports-installer
- ubports-installer.desktop
- 01-disable-update-check.patch
- 02-never-udev.patch
- 03-electrondist.patch)
+ ubports-installer.desktop)
sha256sums=('SKIP'
- 'e3167aa1469a33d1eca4dae377ed51675bea08e61e6d17f94f83a241538be56b'
- '7f59cb66ab7e59caeff93f697e47f26f43a9a221258f4d89dee580e41dd7a39a'
- 'f5a47dd84c2ce46528385a673d93e465132a80a5a72de5b4cf41e055f9f60fe4'
- 'a9d899eaf4e8a004c20d7d9ff6af696aa9cd5602e5e95583f4fe27ecaa7aa03f'
- '768fcea52f63fed0bebb61861437db5f7e1f00358ad594c8d5593adc43a0f0c0')
+ '461694d8ebce4d14e27be15d278ab1c1610c998962a94a7aaff1c64886f85dbe'
+ '7f59cb66ab7e59caeff93f697e47f26f43a9a221258f4d89dee580e41dd7a39a')
pkgver() {
cd "$pkgname"
@@ -30,12 +24,7 @@ pkgver() {
prepare() {
cd "$pkgname"
- for p in ../{01-disable-update-check,02-never-udev,03-electrondist}.patch; do
- echo "Applying $p"
- patch -Np1 <"$p"
- done
- npm install --no-audit --no-progress --no-fund --ignore-scripts electron@"$(</usr/lib/electron/version)"
- npm run prerender
+ npm ci
}
build() {
@@ -48,12 +37,10 @@ package() {
install -Dm755 -t "$pkgdir/usr/bin" ubports-installer
cd "$pkgname"
- install -Dm644 -t "$pkgdir/usr/share/ubports-installer" dist/linux-unpacked/resources/app.asar
+ install -dm755 "$pkgdir/opt/ubports-installer"
find ./dist/linux-unpacked/resources/app.asar.unpacked -type d \( -name linux -o -name mac \) -print -exec rm -r {} +
- cp -rt "$pkgdir/usr/share/ubports-installer" dist/linux-unpacked/resources/app.asar.unpacked
-
- find "$pkgdir" -type d -empty -delete -print
+ cp -rt "$pkgdir/opt/ubports-installer" dist/linux-unpacked/*
cd build/icons
for i in *x*.png; do
diff --git a/ubports-installer b/ubports-installer
index 2ba963623de0..d0748847bacc 100755
--- a/ubports-installer
+++ b/ubports-installer
@@ -1,2 +1,2 @@
#!/bin/sh
-USE_SYSTEM_TOOLS=1 exec electron /usr/share/ubports-installer/app.asar "$@"
+USE_SYSTEM_TOOLS=1 exec /opt/ubports-installer/ubports-installer "$@"