Merged bsdutils/Busybox and updated treetap

1 files changed, 49 insertions, 88 deletions

diff --git a/sources/bsdutils/bsdutils.spec b/sources/bsdutils/bsdutils.spec
index 487558d..6c2eb63 100644
--- a/sources/bsdutils/bsdutils.spec
+++ b/sources/bsdutils/bsdutils.spec
@@ -2,93 +2,13 @@
 SRC_FILENAME="bsdutils-13.2.tar.gz"
 SRC_HASH="4547990309afe686c6f36c2a4f7ac5806e0064b182dd1f93f52dda7661979a3c"
 SRC_NAME="bsdutils"
+SRC_REVISION=1
 SRC_URL="https://codeberg.org/dcantrell/bsdutils/archive/v13.2.tar.gz"
 SRC_VERSION="13.2"
 
-# TODO: Determine which utilities should be moved to bsdutils and which should
-#       stick with Busybox. ~ahill
-# [
-# bc
-# cat
-# chgrp
-# chmod
-# chown
-# chroot
-# cksum
-# comm
-# cp
-# csplit
-# cut
-# date
-# dc
-# dd
-# dirname
-# du
-# echo
-# env
-# expand
-# expr
-# factor
-# false
-# fmt
-# fold
-# groups
-# head
-# hexdump
-# hostname
-# id
-# install
-# join
-# kill
-# ln
-# logname
-# ls
-# mkdir
-# mkfifo
-# mknod
-# mktemp
-# mv
-# nice
-# nl
-# nohup
-# paste
-# pathchk
-# pr
-# printenv
-# printf
-# pwd
-# readlink
-# realpath
-# rm
-# rmdir
-# sed
-# seq
-# sleep
-# split
-# stat
-# stdbuf
-# stty
-# sync
-# tail
-# tee
-# test
-# timeout
-# touch
-# tr
-# true
-# truncate
-# tsort
-# tty
-# uname
-# unexpand
-# uniq
-# unlink
-# users
-# which
-# who
-# whoami
-# xargs
-# yes
+# NOTE: Even though the install implementation from bsdutils is being used, some
+#       packages may try to use -D and -t, which are only supported under
+#       Busybox's implementation. ~ahill
 
 build() {
     tar xf ../$SRC_FILENAME
@@ -104,9 +24,50 @@ build() {
     #       dependency from being introduced. ~ahill
     sed -i "/'find'/d" src/meson.build
     # NOTE: Finally, we have a *lot* of duplicate commands between bsdutils and
-    #       Busybox. Busybox takes priority unless the bsdutils version has more
-    #       functionality. ~ahill
-    # ...
+    #       Busybox. After reviewing *all* of the commands they share, these are
+    #       the commands I believe Busybox should handle. ~ahill
+    sed -i "/'dirname'/d" src/meson.build
+    sed -i "/'echo'/d" src/meson.build
+    sed -i "/'expand'/d" src/meson.build
+    sed -i "/'expr'/d" src/meson.build
+    sed -i "/'false'/d" src/meson.build
+    sed -i "/'fold'/d" src/meson.build
+    sed -i "/'groups'/d" src/meson.build
+    sed -i "/'head'/d" src/meson.build
+    sed -i "/'hexdump'/d" src/meson.build
+    sed -i "/'kill'/d" src/meson.build
+    sed -i "/'ln'/d" src/meson.build
+    sed -i "/'logname'/d" src/meson.build
+    sed -i "/'ls'/d" src/meson.build
+    sed -i "/'mkdir'/d" src/meson.build
+    sed -i "/'mkfifo'/d" src/meson.build
+    sed -i "/'mknod'/d" src/meson.build
+    sed -i "/'mktemp'/d" src/meson.build
+    sed -i "/'mv'/d" src/meson.build
+    sed -i "/'nice'/d" src/meson.build
+    sed -i "/'nohup'/d" src/meson.build
+    sed -i "/'paste'/d" src/meson.build
+    sed -i "/'printenv'/d" src/meson.build
+    sed -i "/'printf'/d" src/meson.build
+    sed -i "/'pwd'/d" src/meson.build
+    sed -i "/'rm'/d" src/meson.build
+    sed -i "/'rmdir'/d" src/meson.build
+    sed -i "/'sed'/d" src/meson.build
+    sed -i "/'sleep'/d" src/meson.build
+    sed -i "/'stat'/d" src/meson.build
+    sed -i "/'stty'/d" src/meson.build
+    sed -i "/'sync'/d" src/meson.build
+    sed -i "/'tail'/d" src/meson.build
+    sed -i "/'tee'/d" src/meson.build
+    sed -i "/'test'/d" src/meson.build
+    sed -i "/'true'/d" src/meson.build
+    sed -i "/'tty'/d" src/meson.build
+    sed -i "/'uname'/d" src/meson.build
+    sed -i "/'unexpand'/d" src/meson.build
+    sed -i "/'uniq'/d" src/meson.build
+    sed -i "/'users'/d" src/meson.build
+    sed -i "/'whoami'/d" src/meson.build
+    sed -i "/'xargs'/d" src/meson.build
     muon setup $TT_MESON_COMMON build
     muon samu -C build
 }
@@ -118,4 +79,4 @@ clean() {
 package() {
     cd bsdutils/
     muon -C build install -d $TT_INSTALLDIR
-}
\ No newline at end of file
+}