Added handler for mktemp failure for psutil script and removed secondary mktemp command
parent
196745fd9d
commit
b71ae67eab
13
bashtop
13
bashtop
|
@ -4826,8 +4826,15 @@ if [[ $use_psutil == true ]]; then
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
pytmpdir=$(mktemp -d "${TMPDIR:-/tmp}"/XXXXXXXXXXXX)
|
if ! pytmpdir=$(mktemp -d "${TMPDIR:-/tmp}"/XXXXXXXXXXXX); then
|
||||||
pywrapper=$(mktemp "${pytmpdir}"/bashtop.psutil.XXXX)
|
if [[ $system == "Linux" ]]; then
|
||||||
|
use_psutil="false"
|
||||||
|
else
|
||||||
|
echo "ERROR: Failed setting up temp directory for psutil script!"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
pywrapper="${pytmpdir}/bashtop.psutil"
|
||||||
|
|
||||||
cat << 'EOF' > "${pywrapper}"
|
cat << 'EOF' > "${pywrapper}"
|
||||||
import os, sys, subprocess, re, time, psutil
|
import os, sys, subprocess, re, time, psutil
|
||||||
|
@ -5230,7 +5237,7 @@ while command != 'quit':
|
||||||
print('/EOL')
|
print('/EOL')
|
||||||
#print(f'{command}', file=sys.stderr)
|
#print(f'{command}', file=sys.stderr)
|
||||||
EOF
|
EOF
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#* Set up traps for ctrl-c, soft kill, window resize, ctrl-z and resume from ctrl-z
|
#* Set up traps for ctrl-c, soft kill, window resize, ctrl-z and resume from ctrl-z
|
||||||
|
|
Loading…
Reference in New Issue