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