diff options
author | Matthew McGinn | 2020-01-08 11:12:47 -0500 |
---|---|---|
committer | Matthew McGinn | 2020-01-08 11:12:47 -0500 |
commit | 087227a2593a78fbf53f443fde66fd33697f21b3 (patch) | |
tree | 834f8e6312ca31988c901bb4857862e1a2e2fa04 | |
parent | 9de9dd232174d2562dbfcd2b8749911d4f10bb6d (diff) | |
download | aur-087227a2593a78fbf53f443fde66fd33697f21b3.tar.gz |
fixup: if submodule checkout fails, use the master branch
Signed-off-by: Matthew McGinn <mamcgi@gmail.com>
-rw-r--r-- | .SRCINFO | 11 | ||||
-rw-r--r-- | PKGBUILD | 17 |
2 files changed, 12 insertions, 16 deletions
@@ -1,7 +1,7 @@ pkgbase = balena-etcher pkgdesc = Flash OS images to SD cards & USB drives, safely and easily pkgver = 1.5.70 - pkgrel = 3 + pkgrel = 4 epoch = 2 url = https://etcher.io arch = x86_64 @@ -11,25 +11,24 @@ pkgbase = balena-etcher makedepends = git makedepends = jq depends = electron6 - depends = gtk2 + depends = gtk3 depends = libxtst depends = libxss - depends = gconf depends = nss depends = alsa-lib depends = nodejs + depends = glib2 + depends = polkit + depends = libusb optdepends = libnotify: for notifications - optdepends = speech-dispatcher: for text-to-speech conflicts = etcher conflicts = etcher-git conflicts = etcher-bin options = !strip source = etcher::git+https://github.com/balena-io/etcher.git#tag=v1.5.70 - source = git+https://github.com/balena-io/scripts.git source = balena-etcher-electron source = balena-etcher-electron.desktop sha256sums = SKIP - sha256sums = SKIP sha256sums = 911cca26a477c0525085410c78cd9292dc4b6bd27fb7340034fe762d333a3f52 sha256sums = c950d9578f9cf60998c920bb60c6617559963f06a4918e7072fdc706b0ef5754 @@ -5,37 +5,34 @@ pkgname=balena-etcher _pkgname=etcher pkgver=1.5.70 -pkgrel=3 +pkgrel=4 epoch=2 pkgdesc='Flash OS images to SD cards & USB drives, safely and easily' arch=(x86_64) _github_url='https://github.com/balena-io/etcher' url='https://etcher.io' license=(Apache) -depends=(electron6 gtk2 libxtst libxss gconf nss alsa-lib nodejs) -makedepends=(npm python2 git jq) -optdepends=('libnotify: for notifications' - 'speech-dispatcher: for text-to-speech') +depends=("electron6" "gtk3" "libxtst" "libxss" "nss" "alsa-lib" "nodejs" "glib2" "polkit" "libusb") +makedepends=("npm" "python2" "git" "jq") +optdepends=("libnotify: for notifications") conflicts=("${_pkgname}" "${_pkgname}-git" "${_pkgname}-bin" ) options=('!strip') source=("etcher::git+https://github.com/balena-io/${_pkgname}.git#tag=v${pkgver}" - 'git+https://github.com/balena-io/scripts.git' "${pkgname}-electron" "${pkgname}-electron.desktop" ) sha256sums=('SKIP' - 'SKIP' '911cca26a477c0525085410c78cd9292dc4b6bd27fb7340034fe762d333a3f52' - 'c950d9578f9cf60998c920bb60c6617559963f06a4918e7072fdc706b0ef5754') + 'c950d9578f9cf60998c920bb60c6617559963f06a4918e7072fdc706b0ef5754' + ) prepare() { cd "${_pkgname}" git submodule init - git config submodule.scripts/resin.url "${srcdir}/scripts" - git submodule update + git submodule update || cd "${srcdir}/${_pkgname}/scripts/resin" && git checkout -- } build() { |