makedeb


fish 1:3.7.1-2


The user-friendly command line shell.

Click here to go back to the commit logs for fish.

Commit:


Hash: 1b180dfbb35ad748b2a0611b94af73c58d7d61dd

Message: Include more files in the fish package

Diff


diff --git a/.SRCINFO b/.SRCINFO
index fc7ff84..6430d56 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,7 +3,7 @@ pkgname = fish
 epoch = 1
 pkgbase = fish
 pkgdesc = The user-friendly command line shell.
-pkgrel = 0
+pkgrel = 1
 pkgver = 3.6.1
 url = https://fishshell.com/
 arch = amd64
@@ -11,6 +11,7 @@ arch = arm64
 arch = arm32
 arch = i386
 arch = i686
+conflicts = fish-common
 depends = libpcre2-32-0
 license = OpenBSD
 makedepends = build-essential
diff --git a/PKGBUILD b/PKGBUILD
index 9b338af..43380bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,16 @@
 # Maintainer: Jonathan Apodaca <jrapodaca@gmail.com>
 pkgname=fish
 pkgver=3.6.1
-pkgrel=0
+pkgrel=1
 epoch=1
+conflicts=('fish-common')
 depends=(
   'libpcre2-32-0'
 )
+makedepends=(
+  'gzip'
+  'rsync'
+)
 pkgdesc="The user-friendly command line shell."
 arch=(amd64 arm64 arm32 i386 i686)
 url="https://fishshell.com/"
@@ -27,6 +32,22 @@ build() {
 }
 
 package() {
-  cd "$pkgname-$pkgver/build"
+  pushd "$pkgname-$pkgver/build"
   make DESTDIR="$pkgdir" install
+  popd
+
+  pushd "$pkgname-$pkgver"
+  mkdir -p "$pkgdir/usr/share/applications"
+  mkdir -p "$pkgdir/usr/share/doc/fish"
+  mkdir -p "$pkgdir/usr/share/fish/completions"
+  install -D "etc/config.fish"    "$pkgdir/etc/fish/config.fish"
+  rsync   -a "fish.desktop"       "$pkgdir/usr/share/applications/fish.desktop"
+  rsync   -a "user_doc/html/"     "$pkgdir/usr/share/doc/fish/" --exclude "*.rst"
+  rsync   -a "doc_src/"           "$pkgdir/usr/share/doc/fish/" --exclude "*.rst"
+  rsync   -a "share/completions/" "$pkgdir/usr/share/fish/completions/"
+
+  gzip "$pkgdir/usr/share/man/man1/fish.1"
+  gzip "$pkgdir/usr/share/man/man1/fish_indent.1"
+  gzip "$pkgdir/usr/share/man/man1/fish_key_reader.1"
+
 }