refactor: update uutils stuff

6 files changed, 19 insertions, 22 deletions

diff --git a/coreutils-uutils-libselinux/.SRCINFO b/coreutils-uutils-selinux/.SRCINFO
index 649e0de..145136f 100644
--- a/coreutils-uutils-libselinux/.SRCINFO
+++ b/coreutils-uutils-selinux/.SRCINFO
@@ -1,10 +1,9 @@
-pkgbase = coreutils-uutils-libselinux
-	pkgdesc = (warning: use at own risk) Cross-platform Rust rewrite of the GNU coreutils installed as system core utilities. Built with libselinux for the chcon and runcon binaries
+pkgbase = coreutils-uutils-selinux
+	pkgdesc = Cross-platform Rust rewrite of the GNU coreutils installed as system core utilities with SELinux support (WARNING: use at own risk).
 	pkgver = 0.1.0
 	pkgrel = 1
 	url = https://github.com/uutils/coreutils
 	arch = x86_64
-	license = GPL3
 	license = MIT
 	makedepends = cargo
 	makedepends = clang
@@ -25,4 +24,4 @@ pkgbase = coreutils-uutils-libselinux
 	sha256sums = 55c528f2b53c1b30cb704550131a806e84721c87b3707b588a961a6c97f110d8
 	sha256sums = d8290988c9c8275e2087f1a63d63c420c88ebcf7c50aed0ef53d9dcd46517b36
 
-pkgname = coreutils-uutils-libselinux
+pkgname = coreutils-uutils-selinux
diff --git a/coreutils-uutils-libselinux/.gitignore b/coreutils-uutils-selinux/.gitignore
index 8d78c83..8d78c83 100644
--- a/coreutils-uutils-libselinux/.gitignore
+++ b/coreutils-uutils-selinux/.gitignore
diff --git a/coreutils-uutils-libselinux/0001-update-selinux-progs.patch b/coreutils-uutils-selinux/0001-update-selinux-progs.patch
index aee086f..aee086f 100644
--- a/coreutils-uutils-libselinux/0001-update-selinux-progs.patch
+++ b/coreutils-uutils-selinux/0001-update-selinux-progs.patch
diff --git a/coreutils-uutils-libselinux/PKGBUILD b/coreutils-uutils-selinux/PKGBUILD
index 722cf1f..2b2c314 100644
--- a/coreutils-uutils-libselinux/PKGBUILD
+++ b/coreutils-uutils-selinux/PKGBUILD
@@ -1,13 +1,12 @@
 # Maintainer: kj_sh604 <406hs_jk@proton.me>
 
-pkgname=coreutils-uutils-libselinux
+pkgname=coreutils-uutils-selinux
 pkgver=0.1.0
 pkgrel=1
-pkgdesc='(warning: use at own risk) Cross-platform Rust rewrite of the GNU
-coreutils installed as system core utilities. Built with libselinux for the
-chcon and runcon binaries'
+pkgdesc='Cross-platform Rust rewrite of the GNU coreutils installed as system
+core utilities with SELinux support (WARNING: use at own risk).'
 arch=('x86_64')
-license=('GPL3' 'MIT')
+license=('MIT')
 url='https://github.com/uutils/coreutils'
 conflicts=(
   coreutils
@@ -37,13 +36,13 @@ sha256sums=('55c528f2b53c1b30cb704550131a806e84721c87b3707b588a961a6c97f110d8'
             'd8290988c9c8275e2087f1a63d63c420c88ebcf7c50aed0ef53d9dcd46517b36')
 
  prepare() {
-   cd ${pkgname%-uutils-libselinux}-${pkgver}
+   cd ${pkgname%-uutils-selinux}-${pkgver}
   # patch SELINUX_PROGS to include stty
   patch -Np1 -i $srcdir/0001-update-selinux-progs.patch
 }
 
 package() {
-  cd ${pkgname%-uutils-libselinux}-${pkgver}
+  cd ${pkgname%-uutils-selinux}-${pkgver}
   export RUSTONIG_DYNAMIC_LIBONIG=1
   make install \
       USE=selinux \
@@ -55,17 +54,19 @@ package() {
       MULTICALL=y
   # add libstdbuf.so
   mkdir -p $pkgdir/usr/lib/coreutils
-  cd $srcdir && cd ${pkgname%-uutils-libselinux}-${pkgver}/target/release/deps
+  cd $srcdir && cd ${pkgname%-uutils-selinux}-${pkgver}/target/release/deps
   mv liblibstdbuf.so $pkgdir/usr/lib/coreutils/libstdbuf.so
   # clean conflicts (archlinux ships these in other apps)
   cd $pkgdir/usr/bin
-  rm groups hostname install kill more uptime
+  rm hostname kill more uptime
+  rm $pkgdir/usr/share/bash-completion/completions/*
+  rm $pkgdir/usr/share/man/man1/{hostname.1,kill.1,more.1,uptime.1}
   # symlink missing binaries
   if [ -f "coreutils" ]; then
     local binaries=(
-      "b2sum" "b3sum" "install" "md5sum" "sha1sum" "sha224sum" "sha256sum"
-      "sha3-224sum" "sha3-256sum" "sha3-384sum" "sha3-512sum" "sha384sum"
-      "sha3sum" "sha512sum" "shake128sum" "shake256sum"
+      "b2sum" "b3sum" "md5sum" "sha1sum" "sha224sum" "sha256sum" "sha3-224sum"
+      "sha3-256sum" "sha3-384sum" "sha3-512sum" "sha384sum" "sha3sum"
+      "sha512sum" "shake128sum" "shake256sum"
     )
     for bin in "${binaries[@]}"; do
       ln -s coreutils "$bin" || echo "warning: failed to create symlink for $bin"
@@ -73,9 +74,6 @@ package() {
   else
     echo "coreutils binary not found, skipping symlink creation."
   fi
-  # additional cleanup
-  rm $pkgdir/usr/share/bash-completion/completions/*
-  rm $pkgdir/usr/share/man/man1/{groups.1,hostname.1,install.1,kill.1,more.1,uptime.1}
 }
 
 # vim: ts=2 sw=2 et:
diff --git a/coreutils-uutils/.SRCINFO b/coreutils-uutils/.SRCINFO
index 60b4eb6..c3f2dda 100644
--- a/coreutils-uutils/.SRCINFO
+++ b/coreutils-uutils/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = coreutils-uutils
-	pkgdesc = (warning: use at own risk) Cross-platform Rust rewrite of the GNU coreutils installed as system core utilities.
+	pkgdesc = Cross-platform Rust rewrite of the GNU coreutils installed as system core utilities (WARNING: use at own risk).
 	pkgver = 0.1.0
 	pkgrel = 3
 	url = https://github.com/uutils/coreutils
diff --git a/coreutils-uutils/PKGBUILD b/coreutils-uutils/PKGBUILD
index bad4287..6abb692 100644
--- a/coreutils-uutils/PKGBUILD
+++ b/coreutils-uutils/PKGBUILD
@@ -3,8 +3,8 @@
 pkgname=coreutils-uutils
 pkgver=0.1.0
 pkgrel=3
-pkgdesc='(warning: use at own risk) Cross-platform Rust rewrite of the GNU
-coreutils installed as system core utilities.'
+pkgdesc='Cross-platform Rust rewrite of the GNU coreutils installed as system
+core utilities (WARNING: use at own risk).'
 arch=('x86_64')
 license=('MIT')
 url='https://github.com/uutils/coreutils'