Llewellyn/Tomb
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/Tomb.git synced 2024-09-25 11:19:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

adopt external utility cat instead of zsh builtin

Browse Source 
fix #426
This commit is contained in:
Jaromil 2021-10-13 15:46:34 +02:00
parent 930b414889
commit 90eec3d830
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tomb
View File

@ -182,11 +182,6 @@ TRAPPIPE() { _endgame PIPE }
TRAPTERM() { _endgame TERM } TRAPTERM() { _endgame TERM }
TRAPSTOP() { _endgame STOP } TRAPSTOP() { _endgame STOP }
_cat() { local -a _arr;
# read file using mapfile, newline fix
_arr=("${(f@)${mapfile[${1}]%$'\n'}}"); print "$_arr"
}
_is_found() { _is_found() {
# returns 0 if binary is found in path # returns 0 if binary is found in path
[[ -z $1 ]] && return 1 [[ -z $1 ]] && return 1
@ -2353,12 +2348,12 @@ mount_tomb() {
# print out when it was opened the last time, by whom and where # print out when it was opened the last time, by whom and where
[[ -r ${tombmount}/.last ]] && { [[ -r ${tombmount}/.last ]] && {
tombsince=$(_cat ${tombmount}/.last) tombsince=$(cat ${tombmount}/.last)
tombsince=$(date --date=@$tombsince +%c) tombsince=$(date --date=@$tombsince +%c)
tombtty=$(_cat ${tombmount}/.tty) tombtty=$(cat ${tombmount}/.tty)
tombhost=$(_cat ${tombmount}/.host) tombhost=$(cat ${tombmount}/.host)
tomblast=$(_cat ${tombmount}/.last) tomblast=$(cat ${tombmount}/.last)
tombuid=$(_cat ${tombmount}/.uid | tr -d ' ') tombuid=$(cat ${tombmount}/.uid | tr -d ' ')
tombuser=`_get_username $tombuid` tombuser=`_get_username $tombuid`
@ -2533,11 +2528,11 @@ awk "/mapper/"' { print $2 ";" $3 ";" $4 ";" $5 }'`
# find out who opens it from where # find out who opens it from where
[[ -r ${tombmount}/.tty ]] && { [[ -r ${tombmount}/.tty ]] && {
tombsince=$(_cat ${tombmount}/.last) tombsince=$(cat ${tombmount}/.last)
tombsince=$(date --date=@$tombsince +%c) tombsince=$(date --date=@$tombsince +%c)
tombtty=$(_cat ${tombmount}/.tty) tombtty=$(cat ${tombmount}/.tty)
tombhost=$(_cat ${tombmount}/.host) tombhost=$(cat ${tombmount}/.host)
tombuid=$(_cat ${tombmount}/.uid | tr -d ' ') tombuid=$(cat ${tombmount}/.uid | tr -d ' ')
tombuser=`_get_username $tombuid` tombuser=`_get_username $tombuid`
} }
@ -3049,8 +3044,8 @@ list_processes() {
for pnum in ${(f)"$(_sudo lsof -t +D $tombmount)"}; do for pnum in ${(f)"$(_sudo lsof -t +D $tombmount)"}; do
found=$(($found + 1)) found=$(($found + 1))
_verbose "process found: $pnum" _verbose "process found: $pnum"
puid=$(_cat /proc/${pnum}/loginuid) puid=$(cat /proc/${pnum}/loginuid)
pcmd=$(_cat /proc/${pnum}/cmdline) pcmd=$(cat /proc/${pnum}/cmdline)
powner=`_get_username $puid` powner=`_get_username $puid`
_verbose "process found: $pnum $pcmd ($powner)" _verbose "process found: $pnum $pcmd ($powner)"
_message "::1 tombname:: ::2 cmd:: (::3 owner::)" \ _message "::1 tombname:: ::2 cmd:: (::3 owner::)" \
@ -3091,8 +3086,8 @@ slam_tomb() {
${tombname} ${tombmount} ${tombname} ${tombmount}
# iterate through all processes running in mounted tombs # iterate through all processes running in mounted tombs
for pnum in ${(f)"$(_sudo lsof -t +D $tombmount)"}; do for pnum in ${(f)"$(_sudo lsof -t +D $tombmount)"}; do
puid=$(_cat /proc/${pnum}/loginuid) puid=$(cat /proc/${pnum}/loginuid)
pcmd=$(_cat /proc/${pnum}/cmdline) pcmd=$(cat /proc/${pnum}/cmdline)
powner=`_get_username $puid` powner=`_get_username $puid`
_verbose "process found: $pnum $pcmd ($powner)" _verbose "process found: $pnum $pcmd ($powner)"
# iterate through 3 different signals to send, break on success # iterate through 3 different signals to send, break on success