0.2.2-beta

Signed-off-by: Bruce Zhang <zttt183525594@gmail.com>

3 files changed, 24 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7ff815698e5b..fc7baed85967 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ubports-installer
 	pkgdesc = A simple tool to install Ubuntu Touch on UBports devices
-	pkgver = 0.1.21_beta
-	pkgrel = 4
+	pkgver = 0.2.2_beta
+	pkgrel = 1
 	url = https://github.com/ubports/ubports-installer
 	arch = any
 	license = GPL3
@@ -12,14 +12,14 @@ pkgbase = ubports-installer
 	depends = android-udev
 	depends = electron
 	conflicts = ubports-installer-git
-	source = https://github.com/ubports/ubports-installer/archive/0.1.21-beta.tar.gz
+	source = https://github.com/ubports/ubports-installer/archive/0.2.2-beta.tar.gz
 	source = ubports-installer.sh
 	source = ubports-installer.desktop
 	source = rootless.patch
-	sha512sums = 75b0f62c482e78925f9b9428d589d6c133b7693190e0de5de4f0efd8ce6d3f46f2fb3fa619850be6a4b227ca5ff0ddba77e1f33e9058d92f3b19632ce7c7ca90
+	sha512sums = 2316633f620db34846dfda3c55774682a371d30ebe28360d882da69d18316e5f069d02ffa91cd88243337040ffbaacce2f1c83ab63a934154ebcfd8a418f5a83
 	sha512sums = d622cfe1f01d1ef0fc89c6d05e655f0396133142a3244353cc43dbefb493ac0e896f4927e350cda5138b4b369975e5755552f5dfaef53dee209af5eb1d90f5f2
 	sha512sums = 87d6760633d83b5d02abd3f54619fa1082a2f1a69be85ee010b2e552f6a926888c37aacb9b71d75b06d87311942dc219a3e51afd758cb2b9985a0bcb1d9a0455
-	sha512sums = 5e1a99f7bde3fd7b5b6b22d771421520e360f5f133fdc78ed35eea03969aa0f379df1ab720c792fd2c7155e92e4ccb70db9e77732ecedbb60e4ab294c8ea7107
+	sha512sums = dcc4efbe608a518adbad074d741745a8d43da580bc2279f429fc3c458a496ec91eaa913c4d43d49979b3411326dbb4e551bec092fb07cfe96fab5f559588677a
 
 pkgname = ubports-installer
 
diff --git a/PKGBUILD b/PKGBUILD
index 09d38b6e37b8..a7cba7cc3be7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Contributor: Matthias Lisin <ml@visu.li>
 # Maintainer: Bruce Zhang <zttt183525594@gmail.com>
 pkgname=ubports-installer
-pkgver=0.1.21_beta
-pkgrel=4
+pkgver=0.2.2_beta
+pkgrel=1
 pkgdesc='A simple tool to install Ubuntu Touch on UBports devices'
 arch=(any)
 url='https://github.com/ubports/ubports-installer'
@@ -14,10 +14,10 @@ source=("https://github.com/ubports/ubports-installer/archive/${pkgver/_/-}.tar.
         ubports-installer.sh
         ubports-installer.desktop
         rootless.patch)
-sha512sums=('75b0f62c482e78925f9b9428d589d6c133b7693190e0de5de4f0efd8ce6d3f46f2fb3fa619850be6a4b227ca5ff0ddba77e1f33e9058d92f3b19632ce7c7ca90'
+sha512sums=('2316633f620db34846dfda3c55774682a371d30ebe28360d882da69d18316e5f069d02ffa91cd88243337040ffbaacce2f1c83ab63a934154ebcfd8a418f5a83'
             'd622cfe1f01d1ef0fc89c6d05e655f0396133142a3244353cc43dbefb493ac0e896f4927e350cda5138b4b369975e5755552f5dfaef53dee209af5eb1d90f5f2'
             '87d6760633d83b5d02abd3f54619fa1082a2f1a69be85ee010b2e552f6a926888c37aacb9b71d75b06d87311942dc219a3e51afd758cb2b9985a0bcb1d9a0455'
-            '5e1a99f7bde3fd7b5b6b22d771421520e360f5f133fdc78ed35eea03969aa0f379df1ab720c792fd2c7155e92e4ccb70db9e77732ecedbb60e4ab294c8ea7107')
+            'dcc4efbe608a518adbad074d741745a8d43da580bc2279f429fc3c458a496ec91eaa913c4d43d49979b3411326dbb4e551bec092fb07cfe96fab5f559588677a')
 
 prepare() {
     local cache="$srcdir/npm-cache"
@@ -32,12 +32,12 @@ prepare() {
         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
 }
 
 build() {
     cd "$pkgname-${pkgver/_/-}"
-    node build.js --build-to-dir --linux --no-platform-tools
+    node build.js --package dir --os linux --no-platform-tools
 }
 
 package() {
diff --git a/rootless.patch b/rootless.patch
index 9a17aa176e02..b6cc60a91669 100644
--- a/rootless.patch
+++ b/rootless.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-15 18:59:19.000000000 +0800
++++ package.new/src/utils.js	2019-03-20 14:42:19.202514790 +0800
+@@ -16,7 +16,6 @@
  const tmp = require('tmp');
  const exec = require('child_process').exec;
  const cp = require('child_process');
@@ -9,13 +9,19 @@ 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 @@
+@@ -375,14 +374,7 @@
  }
  
  var needRoot = () => {
--    if ((os.platform() === "win32") || isSnap()) return false;
--    return !process.env.SUDO_UID
-+    return false
+-    if (
+-      (os.platform() === "win32") ||
+-      isSnap() ||
+-      !commandExistsSync("sudo") ||
+-      global.installProperties.noRoot ||
+-      global.installProperties.simulate
+-    ) return false;
+-    else return !process.env.SUDO_UID
++  return false
  }
  
  var ensureRoot = (m) => {