Update omarchy-fish and omarchy-zsh
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
# Maintainer: Ryan Hughes <ryan@omarchy.org>
|
||||
|
||||
pkgname=omarchy-fish
|
||||
pkgver=1.4.0
|
||||
pkgver=1.5.0
|
||||
pkgrel=1
|
||||
pkgdesc="Omarchy shell configuration for Fish"
|
||||
arch=('any')
|
||||
@@ -12,7 +12,7 @@ options=('!debug')
|
||||
install=omarchy-fish.install
|
||||
source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz"
|
||||
"fzf.fish-v10.3.tar.gz::https://github.com/PatrickF1/fzf.fish/archive/refs/tags/v10.3.tar.gz")
|
||||
sha256sums=('SKIP'
|
||||
sha256sums=('ccff0564efa04ee30815c2f593af5be1fb89858c7f49443700f4a0b568f51912'
|
||||
'a0d56e974b8d5144c3262dcf87630c8886407d28a2f9e626e46bc18199fe6f97')
|
||||
package() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
@@ -25,9 +25,13 @@ package() {
|
||||
cp "${srcdir}/fzf.fish-10.3/functions/"*.fish "${pkgdir}/usr/share/fish/vendor_functions.d/"
|
||||
cp "${srcdir}/fzf.fish-10.3/completions/"*.fish "${pkgdir}/usr/share/fish/vendor_completions.d/"
|
||||
|
||||
# Install omarchy-fish conf.d and functions
|
||||
# Install omarchy-fish conf.d, functions, and completions.
|
||||
# dotglob so leading-dot function names like ....fish are not skipped.
|
||||
shopt -s dotglob
|
||||
cp conf.d/*.fish "${pkgdir}/usr/share/fish/vendor_conf.d/"
|
||||
cp functions/*.fish "${pkgdir}/usr/share/fish/vendor_functions.d/"
|
||||
cp completions/*.fish "${pkgdir}/usr/share/fish/vendor_completions.d/"
|
||||
shopt -u dotglob
|
||||
|
||||
# Install templates and documentation
|
||||
install -dm755 "${pkgdir}/usr/share/${pkgname}"
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
# Maintainer: Ryan Hughes <ryan@omarchy.org>
|
||||
|
||||
pkgname=omarchy-zsh
|
||||
pkgver=1.3.0
|
||||
pkgver=1.4.0
|
||||
pkgrel=1
|
||||
pkgdesc="Omarchy shell configuration for Zsh"
|
||||
arch=('any')
|
||||
url="https://github.com/omacom-io/omarchy-zsh"
|
||||
license=('MIT')
|
||||
depends=('zsh' 'eza' 'mise' 'zoxide' 'starship' 'fzf' 'fd' 'bat')
|
||||
depends=('zsh' 'eza' 'mise' 'zoxide' 'starship' 'fzf' 'fd' 'bat' 'zsh-autosuggestions' 'zsh-syntax-highlighting')
|
||||
options=('!debug')
|
||||
install=omarchy-zsh.install
|
||||
source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/heads/master.tar.gz"
|
||||
source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz"
|
||||
"omadots.tar.gz::https://github.com/omacom-io/omadots/archive/refs/heads/master.tar.gz")
|
||||
sha256sums=('SKIP'
|
||||
sha256sums=('45294dc2cdebfc10086518d39276720bb3f55e74728ae31819a3ea61d998e8f5'
|
||||
'SKIP')
|
||||
|
||||
package() {
|
||||
cd "${srcdir}/${pkgname}-master"
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
|
||||
# Install shared shell config from omadots (aliases, functions, envs, inits, inputrc)
|
||||
install -dm755 "${pkgdir}/usr/share/${pkgname}/shell"
|
||||
@@ -28,6 +28,11 @@ package() {
|
||||
# Install zsh-specific zoptions from omarchy-zsh
|
||||
cp shell/zoptions "${pkgdir}/usr/share/${pkgname}/shell/"
|
||||
|
||||
# Install zsh completions to the standard site-functions dir so they
|
||||
# autoload via the default fpath. compinit is invoked from zoptions.
|
||||
install -dm755 "${pkgdir}/usr/share/zsh/site-functions"
|
||||
cp shell/completions/* "${pkgdir}/usr/share/zsh/site-functions/"
|
||||
|
||||
# Install templates and documentation
|
||||
install -dm755 "${pkgdir}/usr/share/${pkgname}"
|
||||
cp -r templates LICENSE README.md "${pkgdir}/usr/share/${pkgname}/"
|
||||
|
||||
Reference in New Issue
Block a user