Rename binary to todoist-cli due to conflict with todoist-appimage

1 files changed, 19 insertions, 14 deletions

diff --git a/PKGBUILD b/PKGBUILD
index f7981261fb72..a92243fc66fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,10 @@
 # Contributor: Thor K. Høgås <thor at roht no>
 # Contributor: Austin Keller
 
-_pkgname=todoist
-pkgname=${_pkgname}-git
-pkgver=r324.2a9f649
+_reponame=todoist
+_pkgname=$_reponame-cli
+pkgname=${_reponame}-git
+pkgver=r326.45738fb
 pkgrel=1
 pkgdesc="Todoist CLI Client, written in Golang."
 arch=('x86_64' 'i686')
@@ -14,13 +15,15 @@ license=('MIT')
 makedepends=('go' 'git')
 optdepends=('peco: for zsh functions script')
 options=('!strip' '!emptydirs')
-source=("${pkgname}::git://github.com/sachaos/todoist.git")
-md5sums=('SKIP')
-provides=('todoist')
-conflicts=('todoist')
+source=('git+https://github.com/sachaos/todoist.git'
+        'rename_todoist_to_todoist_cli.patch' )
+sha256sums=('SKIP'
+            '2d0f8626b98c6b178d6be15ad03be20a49c18add0cb3ec2a1f06e8e727785564')
+provides=('todoist' 'todoist-cli')
+conflicts=('todoist' 'todoist-cli')
 
 pkgver() {
-  cd "$pkgname"
+  cd "$_reponame"
   ( set -o pipefail
     git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@@ -29,23 +32,25 @@ pkgver() {
 
 prepare() {
  mkdir -p "$srcdir/go/src/github.com/sachaos"
- ln -sf "$srcdir/$pkgname" "$srcdir/go/src/github.com/sachaos/$_pkgname"
+ ln -sf "$srcdir/$_reponame" "$srcdir/go/src/github.com/sachaos/$_reponame"
+ patch --directory="$_reponame" --forward --strip=1 --input="${srcdir}/rename_todoist_to_todoist_cli.patch"
 }
 
 build() {
  export GOPATH="$srcdir/go"
  export PATH="$PATH:$srcdir/go/bin/"
  export GO111MODULE="on"
- cd "$srcdir/go/src/github.com/sachaos/$_pkgname"
+ cd "$srcdir/go/src/github.com/sachaos/todoist"
  make install
  chmod u+w -R "$GOPATH"
 }
 
 package() {
-  install -Dm755 "$srcdir/go/bin/$_pkgname" "$pkgdir/usr/bin/$_pkgname"
-  cd "$srcdir/go/src/github.com/sachaos/$_pkgname"
-  install -Dm644 todoist_functions.sh "${pkgdir}/usr/share/todoist/todoist_functions.sh"
-  install -Dm644 todoist_functions_fzf.sh "${pkgdir}/usr/share/todoist/todoist_functions_fzf.sh"
+  install -Dm755 "$srcdir/go/bin/$_reponame" "$pkgdir/usr/bin/$_pkgname"
+  cd "$srcdir/go/src/github.com/sachaos/$_reponame"
+  install -Dm644 todoist_functions.sh "${pkgdir}/usr/share/$_pkgname/todoist_functions.sh"
+  install -Dm644 todoist_functions_fzf.sh "${pkgdir}/usr/share/$_pkgname/todoist_functions_fzf.sh"
+  install -Dm644 todoist_functions_fzf_bash.sh "${pkgdir}/usr/share/$_pkgname/todoist_functions_fzf_bash.sh"
   mkdir -p "$pkgdir/usr/share/licenses/$_pkgname"
   install -m 0644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/"
 }