Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DietPi-Globals | Tuning processing messages #1365

Merged
merged 4 commits into from
Jan 2, 2018
Merged

DietPi-Globals | Tuning processing messages #1365

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d73c2f9
v6.0
MichaIng Jan 1, 2018
5d9fb55
v6.0
MichaIng Jan 1, 2018
57f6bc2
v6.0
MichaIng Jan 1, 2018
ef25128
v6.0
MichaIng Jan 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 26 additions & 21 deletions dietpi/func/dietpi-globals
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,10 @@
#header_line="\e[38;5;154m─────────────────────────────────────────────────────\e[0m"
local header_line="\e[90m─────────────────────────────────────────────────────\e[0m"

#Line overwriting string:
local overwrite_string="\r\033[K"

local status_text_process="\e[33mProcessing\e[0m"
local status_text_ok="\e[32m Ok \e[0m"
local status_text_error="\e[31m Error \e[0m"
local status_text_info="\e[0m Info \e[0m"

local bracket_string_l="\e[90m[\e[0m"
local bracket_string_r="\e[90m]\e[0m"
Expand All @@ -71,19 +69,25 @@

Print_Process(){

echo -ne "$overwrite_string $bracket_string_l$status_text_process$bracket_string_r"
echo -ne "\033[K $bracket_string_l$status_text_process$bracket_string_r"

}

Print_Ok(){

echo -ne "$overwrite_string $bracket_string_l$status_text_ok$bracket_string_r"
echo -ne "\033[K $bracket_string_l$status_text_ok$bracket_string_r"

}

Print_Failed(){

echo -ne "$overwrite_string $bracket_string_l$status_text_error$bracket_string_r"
echo -ne "\033[K $bracket_string_l$status_text_error$bracket_string_r"

}

Print_Info(){

echo -ne "\033[K $bracket_string_l$status_text_info$bracket_string_r"

}

Expand Down Expand Up @@ -141,6 +145,7 @@

Print_Process
Print_Input_String 1
echo -ne "\r"

#Status Ok
#$@ = txt desc
Expand All @@ -162,7 +167,7 @@
#$@ = txt desc
elif (( $1 == 2 )); then

echo -ne "$overwrite_string $bracket_string_l\e[0m Info \e[0m$bracket_string_r"
Print_Info
echo -ne "\e[90m"
Print_Input_String 1
echo -e "\e[0m"
Expand All @@ -172,11 +177,11 @@
#$3 = txt mode
elif (( $1 == 3 )); then

echo -e "$overwrite_string\n \e[38;5;154m$2\e[0m"
echo -e "\033[K\n \e[38;5;154m$2\e[0m"
echo -e "$header_line"
echo -e " \e[90mMode:\e[0m$(Print_Input_String 2)"
echo -e " \e[90mPlease wait...\e[0m\n"
#Print_Process
echo -e " \e[90mMode:\e[0m$(Print_Input_String 2)\n"
Print_Process
echo -ne " \e[90mPlease wait...\e[0m\r"

fi
#-----------------------------------------------------------------------------------
Expand All @@ -190,7 +195,7 @@

if (( ! $G_CHECK_ROOT_USER_VERIFIED )); then

G_DIETPI-NOTIFY -2 'Checking for (elevated) root access, please wait..'
G_DIETPI-NOTIFY -2 'Checking for (elevated) root access'

if (( $UID != 0 )); then

Expand Down Expand Up @@ -464,7 +469,7 @@ $print_logfile_info
G_ERROR_HANDLER_COMMAND="$@"
G_ERROR_HANDLER_EXITCODE=0

G_DIETPI-NOTIFY -2 "Checking file/folder exists: $G_ERROR_HANDLER_COMMAND, please wait..."
G_DIETPI-NOTIFY -2 "Checking file/folder exists: $G_ERROR_HANDLER_COMMAND"

local string=''

Expand Down Expand Up @@ -650,7 +655,7 @@ $print_logfile_info
G_ERROR_HANDLER_EXITCODE=0
G_ERROR_HANDLER_COMMAND="Connection test: $string"

G_DIETPI-NOTIFY -2 "Testing connection to $string for max $(($timeout * $retry)) seconds, please wait..."
G_DIETPI-NOTIFY -2 "Testing connection to $string for max $(($timeout * $retry)) seconds"

wget -q --spider --timeout=$timeout --tries=$retry "$string"
G_ERROR_HANDLER_EXITCODE=$?
Expand Down Expand Up @@ -728,7 +733,7 @@ $print_logfile_info
G_ERROR_HANDLER_COMMAND="G_AGP: $string"
G_ERROR_HANDLER_ONERROR_FPLOGFILE="$G_FP_LOG_APT"

G_DIETPI-NOTIFY -2 "APT removal for: $string, please wait..."
G_DIETPI-NOTIFY -2 "APT removal for: $string"

DEBIAN_FRONTEND=noninteractive apt-get purge -y $string $options 2>&1 | tee "$G_FP_LOG_APT"
G_ERROR_HANDLER_EXITCODE=${PIPESTATUS[0]}
Expand All @@ -747,7 +752,7 @@ $print_logfile_info
G_ERROR_HANDLER_COMMAND="G_AGA:"
G_ERROR_HANDLER_ONERROR_FPLOGFILE="$G_FP_LOG_APT"

G_DIETPI-NOTIFY -2 "APT autoremove + purge, please wait..."
G_DIETPI-NOTIFY -2 "APT autoremove + purge"

DEBIAN_FRONTEND=noninteractive apt-get autoremove --purge -y 2>&1 | tee "$G_FP_LOG_APT"
G_ERROR_HANDLER_EXITCODE=${PIPESTATUS[0]}
Expand All @@ -766,7 +771,7 @@ $print_logfile_info
G_ERROR_HANDLER_COMMAND="G_AGF:"
G_ERROR_HANDLER_ONERROR_FPLOGFILE="$G_FP_LOG_APT"

G_DIETPI-NOTIFY -2 "APT fix, please wait..."
G_DIETPI-NOTIFY -2 "APT fix"

DEBIAN_FRONTEND=noninteractive apt-get install -f -y 2>&1 | tee "$G_FP_LOG_APT"
G_ERROR_HANDLER_EXITCODE=${PIPESTATUS[0]}
Expand All @@ -785,7 +790,7 @@ $print_logfile_info
G_ERROR_HANDLER_COMMAND="G_AGUP:"
G_ERROR_HANDLER_ONERROR_FPLOGFILE="$G_FP_LOG_APT"

G_DIETPI-NOTIFY -2 "APT update, please wait..."
G_DIETPI-NOTIFY -2 "APT update"

DEBIAN_FRONTEND=noninteractive apt-get update 2>&1 | tee "$G_FP_LOG_APT"
G_ERROR_HANDLER_EXITCODE=${PIPESTATUS[0]}
Expand All @@ -804,7 +809,7 @@ $print_logfile_info
G_ERROR_HANDLER_COMMAND="G_AGUG:"
G_ERROR_HANDLER_ONERROR_FPLOGFILE="$G_FP_LOG_APT"

G_DIETPI-NOTIFY -2 "APT upgrade, please wait..."
G_DIETPI-NOTIFY -2 "APT upgrade"

DEBIAN_FRONTEND=noninteractive apt-get upgrade -y 2>&1 | tee "$G_FP_LOG_APT"
G_ERROR_HANDLER_EXITCODE=${PIPESTATUS[0]}
Expand Down Expand Up @@ -833,7 +838,7 @@ $print_logfile_info

fi

G_DIETPI-NOTIFY -2 "APT dist-upgrade, please wait..."
G_DIETPI-NOTIFY -2 "APT dist-upgrade"

DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y 2>&1 | tee "$G_FP_LOG_APT"
G_ERROR_HANDLER_EXITCODE=${PIPESTATUS[0]}
Expand Down Expand Up @@ -875,7 +880,7 @@ $print_logfile_info

if [ -n "$packages_to_install" ]; then

G_DIETPI-NOTIFY -2 "Installing pre-req APT packages, please wait..."
G_DIETPI-NOTIFY -2 "Installing pre-req APT packages"
G_AGI $packages_to_install
exit_code=$?

Expand Down