diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rwxr-xr-x | ubports-installer | 2 |
4 files changed, 14 insertions, 14 deletions
@@ -1,6 +1,6 @@ pkgbase = ubports-installer-git pkgdesc = A simple tool to install Ubuntu Touch on UBports devices - pkgver = 0.4.18_beta.r2.g0ff4a48 + pkgver = 0.4.18_beta.r4.g40b1a03 pkgrel = 1 url = https://github.com/ubports/ubports-installer arch = any @@ -10,7 +10,7 @@ pkgbase = ubports-installer-git makedepends = npm depends = android-tools depends = android-udev - depends = electron6 + depends = electron provides = ubports-installer conflicts = ubports-installer source = ubports-installer-git::git+https://github.com/ubports/ubports-installer.git @@ -18,7 +18,7 @@ pkgbase = ubports-installer-git source = ubports-installer.desktop source = use-system-tools.patch sha256sums = SKIP - sha256sums = bacb11b37b4ecc5ecac78aad8b2950cf17ced03ca11dfb512c34fad18e894261 + sha256sums = cc9a95c9b07eedb6ca18de0c09119747f311d52740ec69d83d08c8bd20b84aad sha256sums = 7f59cb66ab7e59caeff93f697e47f26f43a9a221258f4d89dee580e41dd7a39a sha256sums = 5b31be9612632f1a3beee3d38e97a23ee346ec814b580bfa41dad6e4f7ac4fb9 diff --git a/.gitignore b/.gitignore index 695e2a016807..db5a24b6e31c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ /pkg/ /src/ +/*-git/ /*.log -/*.tar.gz -/*.pkg.tar* +/*.tar* @@ -1,12 +1,12 @@ # Maintainer: ml <ml@visu.li> pkgname=ubports-installer-git -pkgver=0.4.18_beta.r2.g0ff4a48 +pkgver=0.4.18_beta.r4.g40b1a03 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' 'electron6') +depends=('android-tools' 'android-udev' 'electron') makedepends=('git' 'jq' 'npm') provides=('ubports-installer') conflicts=('ubports-installer') @@ -15,7 +15,7 @@ source=("${pkgname}::git+${url}.git" ubports-installer.desktop use-system-tools.patch) sha256sums=('SKIP' - 'bacb11b37b4ecc5ecac78aad8b2950cf17ced03ca11dfb512c34fad18e894261' + 'cc9a95c9b07eedb6ca18de0c09119747f311d52740ec69d83d08c8bd20b84aad' '7f59cb66ab7e59caeff93f697e47f26f43a9a221258f4d89dee580e41dd7a39a' '5b31be9612632f1a3beee3d38e97a23ee346ec814b580bfa41dad6e4f7ac4fb9') @@ -27,7 +27,7 @@ pkgver() { prepare() { cd "$pkgname" patch -Np1 <../use-system-tools.patch - npm install --no-audit --no-progress --no-fund --ignore-scripts electron@"$(</usr/lib/electron6/version)" + npm install --no-audit --no-progress --no-fund --ignore-scripts electron@"$(</usr/lib/electron/version)" # Removing local references for module in he sshpk; do @@ -41,16 +41,16 @@ build() { cd "$pkgname" npx electron-builder --linux --dir \ -c buildconfig-generic.json \ - -c.electronDist=/usr/lib/electron6 \ - -c.electronVersion="$(</usr/lib/electron6/version)" + -c.electronDist=/usr/lib/electron \ + -c.electronVersion="$(</usr/lib/electron/version)" } package() { install -Dm644 -t "${pkgdir}/usr/share/applications" ubports-installer.desktop - install -Dm755 -t "${pkgdir}/usr/bin" ubports-installer + 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 -Dm644 -t "${pkgdir}/usr/share/ubports-installer" dist/linux-unpacked/resources/app.asar cd build/icons for i in *x*.png; do diff --git a/ubports-installer b/ubports-installer index 01fbec3aeaef..52fd8e764e6c 100755 --- a/ubports-installer +++ b/ubports-installer @@ -1,2 +1,2 @@ #!/bin/sh -exec electron6 /usr/share/ubports-installer/app.asar "$@" +exec electron /usr/share/ubports-installer/app.asar "$@" |