From 8e8a54f5062498a162a20604de63e62ea349b8ff Mon Sep 17 00:00:00 2001
From: Daniel Winzen <daniel@danwin1210.me>
Date: Sat, 13 Mar 2021 14:05:10 +0100
Subject: [PATCH] Add more commands from coreutils and silence "not a dynamic
 executable" warnings

---
 var/www/setup_chroot.sh | 165 +++++++++++++++++++++++++++-------------
 1 file changed, 112 insertions(+), 53 deletions(-)

diff --git a/var/www/setup_chroot.sh b/var/www/setup_chroot.sh
index 42d1786..290ce9d 100755
--- a/var/www/setup_chroot.sh
+++ b/var/www/setup_chroot.sh
@@ -10,8 +10,8 @@ function CHROOT_BINARY() {
     if [ "$(echo $BINARY | grep -E '.*:.*')" != "" ]; then
         BINARY="$(echo $BINARY | cut -d':' -f2)"
     fi
-    LIB_FILES="$(ldd $BINARY | grep -v 'not a dynamic executable' | awk '{ print $3 }' | grep -E '^/(.*)' || echo)"
-    LDD_FILES="$(ldd $BINARY | grep -v 'not a dynamic executable' | grep 'ld-linux' | awk '{ print $1; }' || echo)"
+    LIB_FILES="$(ldd $BINARY 2>&1 | grep -v 'not a dynamic executable' | awk '{ print $3 }' | grep -E '^/(.*)' || echo)"
+    LDD_FILES="$(ldd $BINARY 2>&1 | grep -v 'not a dynamic executable' | grep 'ld-linux' | awk '{ print $1; }' || echo)"
     if [ "$LIB_FILES" != "" ]; then
         for LIB_FILE in $LIB_FILES; do
             LIB_DIRECTORY="$(dirname $LIB_FILE)"
@@ -65,72 +65,131 @@ CHROOT_DIRECTORY_STRUCTURE=(
 )
 BINARIES_GENERAL=(
     '/bin/bash'
-    '/bin/sh'
-    '/usr/bin/env'
-    '/usr/bin/clear'
-    '/bin/date'
-    '/usr/bin/basename'
-    '/bin/ls'
+    '/bin/bzip2'
+    '/bin/cat'
     '/bin/chmod'
-    '/bin/touch'
-    '/bin/mkdir'
+    '/bin/cp'
+    '/bin/date'
+    '/bin/echo'
+    '/bin/egrep'
+    '/bin/false'
+    '/bin/fgrep'
+    '/bin/grep'
+    '/bin/gunzip'
+    '/bin/gzip'
     '/bin/ln'
+    '/bin/ls'
+    '/bin/mkdir'
+    '/bin/mktemp'
+    '/bin/mv'
+    '/bin/nano'
+    '/bin/pwd'
+    '/bin/readlink'
     '/bin/rm'
     '/bin/rmdir'
-    '/bin/cp'
-    '/bin/mv'
-    '/bin/cat'
-    '/bin/grep'
-    '/bin/egrep'
-    '/bin/fgrep'
     '/bin/sed'
-    '/usr/bin/xargs'
-    '/usr/bin/head'
-    '/usr/bin/tr'
-    '/usr/bin/tail'
-    '/usr/bin/less'
-    '/usr/bin/tput'
-    '/usr/bin/sort'
-    '/bin/which'
-    '/usr/bin/find'
-    '/usr/bin/openssl'
+    '/bin/sh'
+    '/bin/sleep'
     '/bin/tar'
-    '/bin/bzip2'
-    '/bin/gzip'
-    '/bin/gunzip'
-    '/usr/bin/zip'
-    '/usr/bin/unzip'
+    '/bin/touch'
+    '/bin/true'
+    '/bin/uname'
+    '/bin/vdir'
+    '/bin/which'
+    '/usr/bin/['
+    '/usr/bin/awk'
+    '/usr/bin/base32'
+    '/usr/bin/base64'
+    '/usr/bin/basename'
+    '/usr/bin/basenc'
     '/usr/bin/brotli'
-    '/usr/bin/unxz'
-    '/usr/bin/xz'
-    '/usr/bin/zopfli'
+    '/usr/bin/clear'
+    '/usr/bin/composer'
+    '/usr/bin/cksum'
+    '/usr/bin/comm'
+    '/usr/bin/csplit'
     '/usr/bin/curl'
-    '/usr/bin/rsync'
-    '/usr/bin/scp'
-    '/usr/bin/sftp'
-    '/usr/bin/ssh'
-    '/usr/bin/wget'
-    '/usr/bin/php7.3'
-    '/usr/bin/php7.4'
-    '/usr/bin/mysql'
-    '/usr/bin/mysqldump'
-    '/usr/bin/mysqlcheck'
+    '/usr/bin/cut'
+    '/usr/bin/dirname'
+    '/usr/bin/dd'
+    '/usr/bin/dir'
+    '/usr/bin/du'
+    '/usr/bin/env'
+    '/usr/bin/expand'
+    '/usr/bin/expr'
+    '/usr/bin/factor'
+    '/usr/bin/find'
+    '/usr/bin/fmt'
+    '/usr/bin/fold'
     '/usr/bin/git'
     '/usr/bin/git-receive-pack'
     '/usr/bin/git-shell'
     '/usr/bin/git-upload-archive'
     '/usr/bin/git-upload-pack'
-    '/usr/sbin/nologin'
-    '/usr/bin/id'
-    '/bin/uname'
-    '/bin/nano'
-    '/usr/bin/vim'
-    '/usr/bin/vi'
-    '/usr/bin/awk'
-    '/usr/bin/composer'
     '/usr/bin/gpg'
-    '/usr/bin/cut'
+    '/usr/bin/head'
+    '/usr/bin/id'
+    '/usr/bin/install'
+    '/usr/bin/join'
+    '/usr/bin/less'
+    '/usr/bin/link'
+    '/usr/bin/md5sum'
+    '/usr/bin/mysql'
+    '/usr/bin/mysqldump'
+    '/usr/bin/mysqlcheck'
+    '/usr/bin/nl'
+    '/usr/bin/nohup'
+    '/usr/bin/numfmt'
+    '/usr/bin/od'
+    '/usr/bin/openssl'
+    '/usr/bin/paste'
+    '/usr/bin/php7.3'
+    '/usr/bin/php7.4'
+    '/usr/bin/pr'
+    '/usr/bin/printenv'
+    '/usr/bin/printf'
+    '/usr/bin/ptx'
+    '/usr/bin/realpath'
+    '/usr/bin/rsync'
+    '/usr/bin/scp'
+    '/usr/bin/seq'
+    '/usr/bin/sftp'
+    '/usr/bin/sha1sum'
+    '/usr/bin/sha224sum'
+    '/usr/bin/sha256sum'
+    '/usr/bin/sha384sum'
+    '/usr/bin/sha512sum'
+    '/usr/bin/shred'
+    '/usr/bin/shuf'
+    '/usr/bin/sort'
+    '/usr/bin/split'
+    '/usr/bin/ssh'
+    '/usr/bin/stat'
+    '/usr/bin/stdbuf'
+    '/usr/bin/sum'
+    '/usr/bin/tac'
+    '/usr/bin/tail'
+    '/usr/bin/test'
+    '/usr/bin/tee'
+    '/usr/bin/timeout'
+    '/usr/bin/tput'
+    '/usr/bin/tr'
+    '/usr/bin/truncate'
+    '/usr/bin/tsort'
+    '/usr/bin/unexpand'
     '/usr/bin/uniq'
+    '/usr/bin/unlink'
+    '/usr/bin/unxz'
+    '/usr/bin/unzip'
+    '/usr/bin/vi'
+    '/usr/bin/vim'
+    '/usr/bin/wc'
+    '/usr/bin/wget'
+    '/usr/bin/xargs'
+    '/usr/bin/xz'
+    '/usr/bin/zip'
+    '/usr/bin/zopfli'
+    '/usr/sbin/nologin'
 )
 FILES_GENERAL=(
     '/etc/hosts'