diff --git a/bin/portzap b/bin/portzap index 961d2fb..4e5ccbf 100755 --- a/bin/portzap +++ b/bin/portzap @@ -104,7 +104,7 @@ install() { exit 1 fi cd $portzap_dir - find -E -s . -regex .+[^\.git] -regex .+[^\.hooks] -maxdepth 1 -type d \ + find -s . -maxdepth 1 -type d \ -exec $libexec_dir/install-directory $ports_dir $libexec_dir {} + } diff --git a/libexec/portzap/install-directory b/libexec/portzap/install-directory index 0b468ce..7c88312 100755 --- a/libexec/portzap/install-directory +++ b/libexec/portzap/install-directory @@ -7,6 +7,16 @@ for i in $(seq 3 $#); do dir=$(eval echo -n \${$i}) install -d -g $group -m $mode $src $dest/$dir echo Install $(realpath $dest/$dir) - find $dir -maxdepth 1 -type f -exec $libexec_dir/install-file $dest/$dir {} + - find -s $dir -depth 1 -type d -exec $libexec_dir/install-directory $dest $libexec_dir {} \; + + # Install files + find $dir -maxdepth 1 -type f \ + \( -not -name ".gitignore" \) \ + \( -not -name ".arcconfig" \) \ + -exec $libexec_dir/install-file $dest/$dir {} + + + # Install subdirs (recursive) + find -s $dir -depth 1 -type d \ + \( -not -name ".git" \) \ + \( -not -name ".hooks" \) \ + -exec $libexec_dir/install-directory $dest $libexec_dir {} \; done