summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaleb Maclennan2021-08-31 21:06:49 +0300
committerCaleb Maclennan2021-08-31 21:43:37 +0300
commit5af9bdf0535944ca2bbc55809a0eb91cfce78ac6 (patch)
tree44e2bee492979dff3512a3b163676360ee1341c9
parent08416401dd88045915da2213346b921635111a26 (diff)
downloadaur-5af9bdf0535944ca2bbc55809a0eb91cfce78ac6.tar.gz
Redo submodule handling to follow packaging guidelines
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD18
2 files changed, 23 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dfaff5d2cdbf..09cdeb155f97 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = github-desktop
pkgdesc = GUI for managing Git and GitHub
pkgver = 2.9.2
- pkgrel = 1
+ pkgrel = 2
url = https://desktop.github.com
arch = x86_64
license = MIT
@@ -22,8 +22,14 @@ pkgbase = github-desktop
optdepends = github-cli: CLI interface for GitHub
optdepends = hub: CLI interface for GitHub
source = github-desktop::git+https://github.com/shiftkey/desktop.git#tag=release-2.9.2-linux1
+ source = git+https://github.com/github/gemoji.git
+ source = git+https://github.com/github/gitignore.git
+ source = git+https://github.com/github/choosealicense.com.git
source = github-desktop.desktop
sha256sums = SKIP
+ sha256sums = SKIP
+ sha256sums = SKIP
+ sha256sums = SKIP
sha256sums = 932e4c456e8c6db03d27172cf0daa37806bf025bb560d8b3d758c0997d1a618c
pkgname = github-desktop
diff --git a/PKGBUILD b/PKGBUILD
index 13cc4ccacc19..eee1a66f4146 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=github-desktop
pkgver=2.9.2
_gitname="release-$pkgver-linux1"
-pkgrel=1
+pkgrel=2
pkgdesc='GUI for managing Git and GitHub'
arch=(x86_64)
url='https://desktop.github.com'
@@ -29,13 +29,27 @@ makedepends=('nodejs>=10.16.0'
yarn)
DLAGENTS=("http::/usr/bin/git clone --branch $_gitname --single-branch %u")
source=("$pkgname::git+https://github.com/shiftkey/desktop.git#tag=$_gitname"
+ 'git+https://github.com/github/gemoji.git'
+ 'git+https://github.com/github/gitignore.git'
+ 'git+https://github.com/github/choosealicense.com.git'
"$pkgname.desktop")
sha256sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
'932e4c456e8c6db03d27172cf0daa37806bf025bb560d8b3d758c0997d1a618c')
+prepare() {
+ cd "$pkgname"
+ git submodule init
+ git config submodule."gemoji".url "$srcdir/gemoji"
+ git config submodule."app/static/common/gitignore".url "$srcdir/gitignore"
+ git config submodule."app/static/common/choosealicense.com".url "$srcdir/choosealicense.com"
+ git submodule update
+}
+
build() {
cd "$pkgname"
- git submodule update --recursive --init
export DISPLAY=':99.0'
Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
yarn install