War for conflicting scripts only if script is running in a terminal.

This commit is contained in:
Christoph 2022-12-16 11:29:29 +01:00
parent 25dc227b68
commit ffc7fe5f5b
3 changed files with 72 additions and 15 deletions

View File

@ -74,6 +74,14 @@ warn (){
echo ""
}
warn_only_terminal () {
if $terminal ; then
echo ""
echo -e "\t[ \033[33m\033[1mWarning\033[m ]: $*"
echo ""
fi
}
info (){
echo ""
if $terminal ; then
@ -141,6 +149,19 @@ is_number() {
#return $([[ ! -z "${1##*[!0-9]*}" ]])
}
trim() {
local var="$*"
var="${var#"${var%%[![:space:]]*}"}" # remove leading whitespace characters
var="${var%"${var##*[![:space:]]}"}" # remove trailing whitespace characters
echo -n "$var"
}
blank_line() {
if $terminal ; then
echo ""
fi
}
reboot_system() {
# content_type='Content-Type: text/plain;\n charset="utf-8"'
@ -257,11 +278,9 @@ if [[ ${#CONFLICTING_SCRIPTS} -gt 0 ]] ; then
if $_stop_running ; then
echo ""
echo "[ Error ]: The \"${_script_name}\" script is currently running, but it conflicts with this script."
echo ""
echo " Exiting now.."
echo ""
warn_only_terminal "\033[1m${_script_name}\033[m is currently running, but it conflicts with this script.
Exiting now.."
clean_up 1

View File

@ -74,6 +74,14 @@ warn (){
echo ""
}
warn_only_terminal () {
if $terminal ; then
echo ""
echo -e " [ \033[33m\033[1mWarning\033[m ]: $*"
echo ""
fi
}
info (){
echo ""
if $terminal ; then
@ -141,6 +149,19 @@ is_number() {
#return $([[ ! -z "${1##*[!0-9]*}" ]])
}
trim() {
local var="$*"
var="${var#"${var%%[![:space:]]*}"}" # remove leading whitespace characters
var="${var%"${var##*[![:space:]]}"}" # remove trailing whitespace characters
echo -n "$var"
}
blank_line() {
if $terminal ; then
echo ""
fi
}
reboot_system() {
# content_type='Content-Type: text/plain;\n charset="utf-8"'
@ -257,11 +278,9 @@ if [[ ${#CONFLICTING_SCRIPTS} -gt 0 ]] ; then
if $_stop_running ; then
echo ""
echo "[ Error ]: The \"${_script_name}\" script is currently running, but it conflicts with this script."
echo ""
echo " Exiting now.."
echo ""
warn_only_terminal "\033[1m${_script_name}\033[m is currently running, but it conflicts with this script.
Exiting now.."
clean_up 1

View File

@ -74,6 +74,14 @@ warn (){
echo ""
}
warn_only_terminal () {
if $terminal ; then
echo ""
echo -e "\t[ \033[33m\033[1mWarning\033[m ]: $*"
echo ""
fi
}
echo_done() {
if $terminal && $LOGGING ; then
echo -e "\033[75G[ \033[32mdone\033[m ]"
@ -121,6 +129,19 @@ is_number() {
#return $([[ ! -z "${1##*[!0-9]*}" ]])
}
trim() {
local var="$*"
var="${var#"${var%%[![:space:]]*}"}" # remove leading whitespace characters
var="${var%"${var##*[![:space:]]}"}" # remove trailing whitespace characters
echo -n "$var"
}
blank_line() {
if $terminal ; then
echo ""
fi
}
reboot_system() {
# content_type='Content-Type: text/plain;\n charset="utf-8"'
@ -240,11 +261,9 @@ if [[ ${#CONFLICTING_SCRIPTS} -gt 0 ]] ; then
if $_stop_running ; then
echo ""
echo "[ Error ]: The \"${_script_name}\" script is currently running, but it conflicts with this script."
echo ""
echo " Exiting now.."
echo ""
warn_only_terminal "\033[1m${_script_name}\033[m is currently running, but it conflicts with this script.
Exiting now.."
clean_up 1