Use which to determine binary location and ignore non-existing binaries - closes #111

This commit is contained in:
Daniel Winzen
2021-04-25 16:09:48 +02:00
parent 5cd74a31b1
commit 6aea46afaa

View File

@ -9,7 +9,10 @@ ALL_LIB_FILES=()
### functions ### functions
function CHROOT_BINARY() { function CHROOT_BINARY() {
BINARY="$1" BINARY="$(which $1)"
if [ "$BINARY" == "" ]; then
return;
fi
if [ "$(echo $BINARY | grep -E '.*:.*')" != "" ]; then if [ "$(echo $BINARY | grep -E '.*:.*')" != "" ]; then
BINARY="$(echo $BINARY | cut -d':' -f2)" BINARY="$(echo $BINARY | cut -d':' -f2)"
fi fi
@ -82,132 +85,132 @@ CHROOT_DIRECTORY_TO_CLEAN=(
'/usr/sbin' '/usr/sbin'
) )
BINARIES_GENERAL=( BINARIES_GENERAL=(
'/bin/bash' '['
'/bin/bzip2' 'awk'
'/bin/cat' 'base32'
'/bin/chmod' 'base64'
'/bin/cp' 'basename'
'/bin/date' 'basenc'
'/bin/echo' 'bash'
'/bin/egrep' 'brotli'
'/bin/false' 'bzip2'
'/bin/fgrep' 'cat'
'/bin/grep' 'chmod'
'/bin/gunzip' 'cksum'
'/bin/gzip' 'clear'
'/bin/ln' 'comm'
'/bin/ls' 'composer'
'/bin/mkdir' 'cp'
'/bin/mktemp' 'csplit'
'/bin/mv' 'curl'
'/bin/nano' 'cut'
'/bin/pwd' 'date'
'/bin/readlink' 'dd'
'/bin/rm' 'dirname'
'/bin/rmdir' 'dir'
'/bin/sed' 'du'
'/bin/sh' 'echo'
'/bin/sleep' 'egrep'
'/bin/tar' 'env'
'/bin/touch' 'expand'
'/bin/true' 'expr'
'/bin/uname' 'factor'
'/bin/vdir' 'false'
'/bin/which' 'fgrep'
'/usr/bin/[' 'find'
'/usr/bin/awk' 'fmt'
'/usr/bin/base32' 'fold'
'/usr/bin/base64' 'git'
'/usr/bin/basename' 'git-receive-pack'
'/usr/bin/basenc' 'git-shell'
'/usr/bin/brotli' 'git-upload-archive'
'/usr/bin/clear' 'git-upload-pack'
'/usr/bin/composer' 'gpg'
'/usr/bin/cksum' 'grep'
'/usr/bin/comm' 'gunzip'
'/usr/bin/csplit' 'gzip'
'/usr/bin/curl' 'head'
'/usr/bin/cut' 'id'
'/usr/bin/dirname' 'install'
'/usr/bin/dd' 'join'
'/usr/bin/dir' 'less'
'/usr/bin/du' 'link'
'/usr/bin/env' 'ln'
'/usr/bin/expand' 'ls'
'/usr/bin/expr' 'md5sum'
'/usr/bin/factor' 'mkdir'
'/usr/bin/find' 'mktemp'
'/usr/bin/fmt' 'mv'
'/usr/bin/fold' 'mysql'
'/usr/bin/git' 'mysqldump'
'/usr/bin/git-receive-pack' 'mysqlcheck'
'/usr/bin/git-shell' 'nano'
'/usr/bin/git-upload-archive' 'nl'
'/usr/bin/git-upload-pack' 'nohup'
'/usr/bin/gpg' 'numfmt'
'/usr/bin/head' 'od'
'/usr/bin/id' 'openssl'
'/usr/bin/install' 'paste'
'/usr/bin/join' 'php7.4'
'/usr/bin/less' 'php8.0'
'/usr/bin/link' 'pr'
'/usr/bin/md5sum' 'printenv'
'/usr/bin/mysql' 'printf'
'/usr/bin/mysqldump' 'ptx'
'/usr/bin/mysqlcheck' 'pwd'
'/usr/bin/nl' 'readlink'
'/usr/bin/nohup' 'realpath'
'/usr/bin/numfmt' 'rm'
'/usr/bin/od' 'rmdir'
'/usr/bin/openssl' 'rsync'
'/usr/bin/paste' 'scp'
'/usr/bin/php7.4' 'sed'
'/usr/bin/php8.0' 'seq'
'/usr/bin/pr' 'sftp'
'/usr/bin/printenv' 'sh'
'/usr/bin/printf' 'sha1sum'
'/usr/bin/ptx' 'sha224sum'
'/usr/bin/realpath' 'sha256sum'
'/usr/bin/rsync' 'sha384sum'
'/usr/bin/scp' 'sha512sum'
'/usr/bin/seq' 'shred'
'/usr/bin/sftp' 'shuf'
'/usr/bin/sha1sum' 'sleep'
'/usr/bin/sha224sum' 'sort'
'/usr/bin/sha256sum' 'split'
'/usr/bin/sha384sum' 'ssh'
'/usr/bin/sha512sum' 'stat'
'/usr/bin/shred' 'stdbuf'
'/usr/bin/shuf' 'sum'
'/usr/bin/sort' 'tac'
'/usr/bin/split' 'tail'
'/usr/bin/ssh' 'tar'
'/usr/bin/stat' 'test'
'/usr/bin/stdbuf' 'tee'
'/usr/bin/sum' 'timeout'
'/usr/bin/tac' 'touch'
'/usr/bin/tail' 'tput'
'/usr/bin/test' 'tr'
'/usr/bin/tee' 'true'
'/usr/bin/timeout' 'truncate'
'/usr/bin/tput' 'tsort'
'/usr/bin/tr' 'uname'
'/usr/bin/truncate' 'unexpand'
'/usr/bin/tsort' 'uniq'
'/usr/bin/unexpand' 'unlink'
'/usr/bin/uniq' 'unxz'
'/usr/bin/unlink' 'unzip'
'/usr/bin/unxz' 'vdir'
'/usr/bin/unzip' 'vi'
'/usr/bin/vi' 'vim'
'/usr/bin/vim' 'wc'
'/usr/bin/wc' 'wget'
'/usr/bin/wget' 'which'
'/usr/bin/xargs' 'xargs'
'/usr/bin/xz' 'xz'
'/usr/bin/zip' 'zip'
'/usr/bin/zopfli' 'zopfli'
'/usr/sbin/nologin' 'nologin'
) )
FILES_GENERAL=( FILES_GENERAL=(
'/etc/hosts' '/etc/hosts'