From c905c61fff7da9e2aa37104c69fb792aa67e89a3 Mon Sep 17 00:00:00 2001
From: 0x1eef <0x1eef@protonmail.com>
Date: Fri, 20 Jan 2023 22:53:31 -0300
Subject: [PATCH] libexec/portzap/install-directory is now recursive

---
 bin/portzap                       |  4 +---
 libexec/portzap/install-directory |  7 ++++++-
 libexec/portzap/install-port      | 16 ----------------
 3 files changed, 7 insertions(+), 20 deletions(-)
 delete mode 100755 libexec/portzap/install-port

diff --git a/bin/portzap b/bin/portzap
index 15b29f2..e2c3d89 100755
--- a/bin/portzap
+++ b/bin/portzap
@@ -109,9 +109,7 @@ install() {
         exit 1
     fi
     cd $transient_dir
-    find . -maxdepth 1 -type f -exec install -g $group -m $install_mode {} $rest_dir \;
-    find . -maxdepth 1 -type d -exec $libexec_dir/install-directory {} $rest_dir/{} \;
-    find . -depth 2 -type d -exec $libexec_dir/install-port {} $rest_dir $install_mode $libexec_dir \;
+    find . -maxdepth 1 -type d -exec $libexec_dir/install-directory {} $rest_dir $libexec_dir \;
 }
 
 case $1 in
diff --git a/libexec/portzap/install-directory b/libexec/portzap/install-directory
index 55dce38..023ea8f 100755
--- a/libexec/portzap/install-directory
+++ b/libexec/portzap/install-directory
@@ -1,6 +1,11 @@
 #!/bin/sh
 src=$1
 dest=$2
+libexec_dir=$3
 group=_portzap
 mode=u=rwx,g=rx,o=
-install -d -g $group -m $mode $src $dest
+
+install -d -g $group -m $mode $src $dest/$src
+echo Install $(realpath $dest/$src)
+find $src -maxdepth 1 -type f -exec $libexec_dir/install-file {} $dest/$src $libexec_dir \;
+find $src -depth 1 -type d -exec $libexec_dir/install-directory {} $dest $libexec_dir \;
diff --git a/libexec/portzap/install-port b/libexec/portzap/install-port
deleted file mode 100755
index 6d0175c..0000000
--- a/libexec/portzap/install-port
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-src=$1
-dest=$2/${src}
-mode=$3
-libexec_dir=$4
-group=_portzap
-install_args="-m $mode"
-
-$libexec_dir/install-directory $src $dest
-find $src -maxdepth 1 -type f -execdir install $install_args {} $dest/{} \;
-if [ -d "$src/files" ];
-then
-    $libexec_dir/install-directory $src/files $dest/files
-    find $src/files -maxdepth 1 -type f -execdir install $install_args {} $dest/files \;
-fi
-echo Install $(realpath $dest)