Updated to 1.0.10-beta0 and integrated urxvt

5 files changed, 128 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ea92f020f26c..b38f78b87175 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = github-desktop
 	pkgdesc = GUI for managing Git and GitHub.
-	pkgver = 1.0.4_beta0
-	pkgrel = 5
+	pkgver = 1.0.10_beta0
+	pkgrel = 6
 	url = https://desktop.github.com
-	install = github-desktop.install
 	arch = x86_64
 	license = MIT
 	makedepends = libcurl-openssl-1.0
+	makedepends = xorg-server-xvfb
+	makedepends = yarn
 	depends = gnome-keyring
 	depends = git
 	depends = electron
@@ -14,10 +15,11 @@ pkgbase = github-desktop
 	depends = libcurl-compat
 	depends = libcurl-gnutls
 	optdepends = hub: CLI interface for GitHub.
-	source = https://github.com/gengjiawen/desktop/releases/download/v1.0.4-beta0/desktop_1.0.4-beta0_amd64.deb
-	source = desktop.desktop
-	md5sums = e5285a06a6ab201f36b49f877f87abbc
-	md5sums = f705336933a0a69d03695629726dfa5f
+	source = git+https://github.com/desktop/desktop.git
+	source = github-desktop.desktop
+	source = github-desktop.patch
+	sha256sums = SKIP
+	sha256sums = ce0dae70066703df656aa6f509f9a7f4f59e081e8f05be8aa7a81ee4605661c3
+	sha256sums = 25979a1e08c87361d457a277cb39327bdd82cadb3207f21bd11580579d9ecc62
 
 pkgname = github-desktop
-
diff --git a/PKGBUILD b/PKGBUILD
index 63cec127a8b7..7af54a91854d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,47 @@
-# Maintainer: Mikel Pintado <mikelaitornube2010@gmail.com>
+# Maintainter: Ian MacKay <immackay0@gmail.com>
+# Prior Maintainer: Mikel Pintado <mikelaitornube2010@gmail.com>
 # Contributor: Jiawen Geng
 
-pkgname=github-desktop
-pkgver=1.0.4_beta0
-pkgrel=5
+_pkgname='github-desktop'
+pkgname="${_pkgname}"
+pkgver=1.0.10_beta0
+gitname="release-${pkgver//_/-}"
+pkgrel=6
 pkgdesc="GUI for managing Git and GitHub."
 arch=('x86_64')
 url="https://desktop.github.com"
 license=('MIT')
-install=github-desktop.install
 depends=('gnome-keyring' 'git' 'electron' 'nodejs' 'libcurl-compat' 'libcurl-gnutls')
-    optdepends=('hub: CLI interface for GitHub.')
-makedepends=('libcurl-openssl-1.0')
+optdepends=('hub: CLI interface for GitHub.')
+makedepends=('libcurl-openssl-1.0' 'xorg-server-xvfb' 'yarn')
+DLAGENTS=('http::/usr/bin/git clone --branch $gitname --single-branch %u')
 source=(
-    https://github.com/gengjiawen/desktop/releases/download/v${pkgver//_/-}/desktop_${pkgver//_/-}_amd64.deb
-    desktop.desktop
+  git+https://github.com/desktop/desktop.git
+  $_pkgname.desktop
+  $_pkgname.patch
 )
-md5sums=(
-e5285a06a6ab201f36b49f877f87abbc
-f705336933a0a69d03695629726dfa5f
+sha256sums=(
+  'SKIP'
+  ce0dae70066703df656aa6f509f9a7f4f59e081e8f05be8aa7a81ee4605661c3
+  25979a1e08c87361d457a277cb39327bdd82cadb3207f21bd11580579d9ecc62
 )
-
-prepare()   {
-    bsdtar -xJf data.tar.xz
+prepare() {
+  cd desktop
+  patch -p1 -i "$srcdir/$_pkgname.patch"
 }
-
-package()   {
-    cp --preserve=mode -r {opt,usr} "${pkgdir}"
-
-    find "${pkgdir}" -type d -exec chmod 755 {} +
-    cp --preserve=mode ${srcdir}/desktop.desktop ${pkgdir}/usr/share/applications
+build() {
+  cd desktop
+  export DISPLAY=':99.0'
+  Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
+  yarn install
+  yarn build:prod
+}
+package() {
+  install -d "$pkgdir/opt/$_pkgname"
+  cp -r --preserve=mode desktop/dist/GitHub\ Desktop-linux-x64/* "$pkgdir/opt/$_pkgname/"
+  printf '#!/bin/sh\n\nLD_PRELOAD=libcurl.so.3 /opt/github-desktop/GitHub\ Desktop "$@"\n' | install -Dm755 /dev/stdin "$pkgdir/usr/bin/github-desktop"
+  install -D "$_pkgname.desktop" "$pkgdir/usr/share/applications/$_pkgname.desktop"
+  install -D "desktop/app/static/logos/1024x1024.png" "$pkgdir/usr/share/icons/hicolor/1024x1024/apps/$_pkgname.png"
+  install -D "desktop/app/static/logos/512x512.png" "$pkgdir/usr/share/icons/hicolor/512x512/apps/$_pkgname.png"
+  install -D "desktop/app/static/logos/256x256.png" "$pkgdir/usr/share/icons/hicolor/256x256/apps/$_pkgname.png"
 }
-
diff --git a/github-desktop.desktop b/github-desktop.desktop
new file mode 100644
index 000000000000..90e1ee0b7197
--- /dev/null
+++ b/github-desktop.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=GitHub Desktop
+Comment=Extend your GitHub workflow beyond your browser with GitHub Desktop
+Comment[es]=Trabaja con GitHub desde tu escritorio.
+Comment[eu]=GitHub-ekin lan egin zure ordenagailutik.
+Exec=/usr/bin/github-desktop %U
+Terminal=false
+Type=Application
+Icon=github
+Categories=Development;
diff --git a/github-desktop.install b/github-desktop.install
index e91f9fef653c..e69de29bb2d1 100644
--- a/github-desktop.install
+++ b/github-desktop.install
@@ -1,29 +0,0 @@
-pre_install() {
-    rm -rf /usr/bin/github-desktop
-    rm -rf /usr/share/icons/hicolor/*/apps/desktop.png
-    rm -rf /opt/GithubDesktop
-    rm -rf /usr/share/doc/desktop
-    rm -rf /usr/share/applications/desktop.desktop
-}
-
-post_install()  {
-    echo "LD_PRELOAD=libcurl.so.3 /opt/GithubDesktop/desktop "$@"" > /usr/bin/github-desktop
-    chmod 755 /usr/bin/github-desktop
-}
-
-post_remove()   {
-    rm -rf /opt/GithubDesktop
-    rm -rf /usr/share/applications/desktop.desktop
-    rm -rf /usr/share/doc/desktop
-    rm -rf /usr/share/icons/hicolor/512x512/apps/desktop.png
-    rm -rf /usr/share/icons/hicolor/256x256/apps/desktop.png
-    rm -rf /usr/share/icons/hicolor/1024x1024/apps/desktop.png
-    rm -rf /usr/bin/github-desktop
-}
-
-pre_upgrade()   {
-    post_remove
-}
-post_upgrade() {
-    post_install
-}
diff --git a/github-desktop.patch b/github-desktop.patch
new file mode 100644
index 000000000000..ae28d847d9a3
--- /dev/null
+++ b/github-desktop.patch
@@ -0,0 +1,73 @@
+diff -ura orig/app/src/lib/shells/linux.ts new/app/src/lib/shells/linux.ts
+--- orig/app/src/lib/shells/linux.ts	2017-11-16 13:55:35.000000000 -0800
++++ new/app/src/lib/shells/linux.ts	2017-11-17 05:27:59.832386000 -0800
+@@ -6,11 +6,13 @@
+ export enum Shell {
+   Gnome = 'GNOME Terminal',
+   Tilix = 'Tilix',
++  Urxvt = 'URxvt',
+ }
+
+-export const Default = Shell.Gnome
++export const Default = Shell.Urxvt
+
+ export function parse(label: string): Shell {
++
+   if (label === Shell.Gnome) {
+     return Shell.Gnome
+   }
+@@ -19,6 +21,10 @@
+     return Shell.Tilix
+   }
+
++  if (label === Shell.Urxvt) {
++    return Shell.Urxvt
++  }
++
+   return Default
+ }
+
+@@ -32,6 +38,8 @@
+       return getPathIfAvailable('/usr/bin/gnome-terminal')
+     case Shell.Tilix:
+       return getPathIfAvailable('/usr/bin/tilix')
++    case Shell.Urxvt:
++      return getPathIfAvailable('/usr/bin/urxvt')
+     default:
+       return assertNever(shell, `Unknown shell: ${shell}`)
+   }
+@@ -40,9 +48,10 @@
+ export async function getAvailableShells(): Promise<
+   ReadonlyArray<IFoundShell<Shell>>
+ > {
+-  const [gnomeTerminalPath, tilixPath] = await Promise.all([
++  const [gnomeTerminalPath, tilixPath, urxvtPath] = await Promise.all([
+     getShellPath(Shell.Gnome),
+     getShellPath(Shell.Tilix),
++    getShellPath(Shell.Urxvt),
+   ])
+
+   const shells: Array<IFoundShell<Shell>> = []
+@@ -54,6 +63,10 @@
+     shells.push({ shell: Shell.Tilix, path: tilixPath })
+   }
+
++  if (urxvtPath) {
++    shells.push({ shell: Shell.Urxvt, path: urxvtPath })
++  }
++
+   return shells
+ }
+
+@@ -61,6 +74,11 @@
+   shell: IFoundShell<Shell>,
+   path: string
+ ): Promise<void> {
++  if (shell.shell === Shell.Urxvt) {
++    const commandArgs = ['-cd', path]
++    await spawn(shell.path, commandArgs)
++  }
++
+   const commandArgs = ['--working-directory', path]
+   await spawn(shell.path, commandArgs)
+ }