diff --git a/PKGBUILD b/PKGBUILD index 8d54623..2733406 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,14 +1,12 @@ # Maintainer: Eric Torres pkgname=file-scripts -pkgver=1.2.0 +pkgver=2.0.0 pkgrel=1 pkgdesc="Various scripts for performing file-related operations such as editing and deleting." arch=(any) license=(GPL3) -depends=(bash fd fzf mlocate python python-termcolor) +depends=(bash fd fzf) makedepends=(git) -makedepends=(git python-setuptools python-sphinx) -checkdepends=(python-hypothesis python-pytest) source=("${pkgname}::git+file:///home/etorres/Projects/file-scripts") install=$pkgname.install sha256sums=('SKIP') @@ -16,12 +14,8 @@ sha256sums=('SKIP') package() { cd "${srcdir}/${pkgname}" - for script in bash/bin/*; do - install -Dm755 "$script" "$pkgdir/usr/bin/$(basename -s '.sh' "$script")" - done - - for libfile in bash/*.sh; do - install -Dm644 "$libfile" "$pkgdir/usr/share/file-scripts/$(basename "$libfile")" + for script in bin/*; do + install -Dm755 "$script" "$pkgdir/usr/bin/$(basename "$script")" done # Install zsh completions @@ -29,7 +23,3 @@ package() { install -Dm644 "${completion}" "${pkgdir}/usr/share/zsh/site-functions/$(basename "$completion")" done } - -#check() { -# pytest -#} diff --git a/file-scripts.rb b/file-scripts.rb index 19fcb99..1eb5100 100644 --- a/file-scripts.rb +++ b/file-scripts.rb @@ -2,16 +2,15 @@ class FileScripts < Formula desc "Various scripts for performing file-related operations" homepage "https://github.com/etorres4/file-scripts" url "https://github.com/etorres4/file-scripts", :using => :git - version "1.2.0" + version "2.0.0" sha256 "fad7da96c72c8bef81f3ec6a2d1cb13b09fb44e084f98b05ba3a7dfd8b41ae12" depends_on "fd" depends_on "fzf" - #depends_on "python@3.10" def install - system Formula["python@3.10"].opt_bin/"python3", *Language::Python.setup_install_args(prefix) - system + # Install scripts to system + bin.install Dir["bin/*"] # Install completions to zsh/site-functions zsh_completion.install Dir["zsh/_*"] diff --git a/file-scripts.spec b/file-scripts.spec index 0405cae..5471780 100644 --- a/file-scripts.spec +++ b/file-scripts.spec @@ -17,25 +17,16 @@ Name: file-scripts -Version: 1.2.0 +Version: 2.0.0 Release: 0 Summary: Set of scripts for manipulating files License: GPL-3.0-only Group: Productivity/File utilities URL: https://github.com/etorres4/file-scripts Source: %{name}-%{version}.tar.gz -BuildRequires: python3 >= 3.7 -BuildRequires: python3-hypothesis -BuildRequires: python3-setuptools -BuildRequires: python3-Sphinx -BuildRequires: python3-pytest -BuildRequires: fdupes -Requires: python3 >= 3.7 +Requires: /usr/bin/bash Requires: fd Requires: fzf -Requires: mlocate -Requires: python3-termcolor -Supplements: zsh BuildArch: noarch %description @@ -52,11 +43,10 @@ Plugins and completions for helper scripts. %prep %setup -q -%build -%{python3_build} - %install -%{python3_install} +for script in bin/*; do + install -Dm755 "$script" "%{buildroot}/usr/bin/$(basename script)" +done # Install zsh completion functions ZSHCOMPLETIONDIR="%{buildroot}%{_datadir}/zsh/site-functions" @@ -66,15 +56,8 @@ for completion in zsh/*; do install -Dm644 "${completion}" "${ZSHCOMPLETIONDIR}/${completion##*.}" done -%fdupes %{buildroot}/%{_prefix} - -%check -pytest - -#%%files %%{python_files} (bug) %files %attr(0755,-,-) %{_bindir}/* -/usr/lib/python3*/* %files zsh-plugins %{_datadir}/zsh/ diff --git a/python/setup.py b/python/setup.py index 1b5b520..63f0d87 100755 --- a/python/setup.py +++ b/python/setup.py @@ -15,7 +15,7 @@ with open("README", "r") as fh: # ========== Package Setup ========== setuptools.setup( name="file_scripts", - version="1.2.0", + version="2.0.0", author="Eric Torres", author_email="erictorres4@protonmail.com", description="File-related helper scripts",