Circuit-Forge/PRbL
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added catch fo rmissing logfile

Browse source
This commit is contained in:
pyr0ball 2023-05-08 16:45:51 -07:00
parent adf0fecbdb
commit 868ff8831f
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
functions
View file

@ -2,7 +2,7 @@
# pyr0ball script functions library # pyr0ball script functions library
# Initial Vars # Initial Vars
functionsrev=1.1.12 functionsrev=1.1.13
#scriptname="${BASH_SOURCE[0]##*/}" #scriptname="${BASH_SOURCE[0]##*/}"
#rundir="${BASH_SOURCE[0]%/*}" #rundir="${BASH_SOURCE[0]%/*}"
#rundir_absolute=$(cd $rundir && pwd) #rundir_absolute=$(cd $rundir && pwd)
@ -411,19 +411,6 @@ popdfail(){
fail "$@" fail "$@"
} }
logger(){
$@ 2>&1 | tee >(
while IFS= read -r line; do
# strip any escaped strings for logging output
_line=$(echo $line | sed "s,\x1B\[[0-9;]*[a-zA-Z],,g" | tr -dc '[:print:]')
# only print out non-empty lines to log
if [[ "$_line" != "" ]] ; then
printf '[%s] %s\n' "${scriptname}][${pretty_date}" "$_line"
fi
done >> $logfile
)
}
run(){ run(){
_cmd=$@ _cmd=$@
if [[ $dry_run != true ]] ; then if [[ $dry_run != true ]] ; then
@ -442,6 +429,23 @@ run-and-log(){
fi fi
} }
logger(){
if [ ! -f $logfile ] ; then
run mkdir -p ${rundir%/*}
touch $logfile
fi
$@ 2>&1 | tee >(
while IFS= read -r line; do
# strip any escaped strings for logging output
_line=$(echo $line | sed "s,\x1B\[[0-9;]*[a-zA-Z],,g" | tr -dc '[:print:]')
# only print out non-empty lines to log
if [[ "$_line" != "" ]] ; then
printf '[%s] %s\n' "${scriptname}][${pretty_date}" "$_line"
fi
done >> $logfile
)
}
ctrl_c(){ ctrl_c(){
echo -e "\n" echo -e "\n"
fail "User interrupted with Ctrl-C" fail "User interrupted with Ctrl-C"