better script info and visibility
This commit is contained in:
@@ -71,11 +71,18 @@ function run_command {
|
|||||||
local description="$2"
|
local description="$2"
|
||||||
local ask_confirm="${3:-yes}" # Default to asking for confirmation
|
local ask_confirm="${3:-yes}" # Default to asking for confirmation
|
||||||
local use_sudo="${4:-yes}" # Default to using sudo
|
local use_sudo="${4:-yes}" # Default to using sudo
|
||||||
|
|
||||||
|
local full_cmd=""
|
||||||
|
if [[ "$use_sudo" == "no" ]]; then
|
||||||
|
full_cmd="sudo -u $SUDO_USER $cmd"
|
||||||
|
else
|
||||||
|
full_cmd="$cmd"
|
||||||
|
fi
|
||||||
|
|
||||||
log_message "Attempting to run: $description"
|
log_message "Attempting to run: $description"
|
||||||
|
print_info "\nCommand: $full_cmd"
|
||||||
if [[ "$ask_confirm" == "yes" ]]; then
|
if [[ "$ask_confirm" == "yes" ]]; then
|
||||||
if ! ask_confirmation "\n$description"; then
|
if ! ask_confirmation "$description"; then
|
||||||
# print_info "$description was skipped."
|
# print_info "$description was skipped."
|
||||||
log_message "$description was skipped by user choice."
|
log_message "$description was skipped by user choice."
|
||||||
return 1
|
return 1
|
||||||
@@ -84,13 +91,6 @@ function run_command {
|
|||||||
print_info "\n$description" # Echo what it's doing without confirmation
|
print_info "\n$description" # Echo what it's doing without confirmation
|
||||||
fi
|
fi
|
||||||
|
|
||||||
local full_cmd=""
|
|
||||||
if [[ "$use_sudo" == "no" ]]; then
|
|
||||||
full_cmd="sudo -u $SUDO_USER $cmd"
|
|
||||||
else
|
|
||||||
full_cmd="$cmd"
|
|
||||||
fi
|
|
||||||
|
|
||||||
while ! eval "$full_cmd"; do
|
while ! eval "$full_cmd"; do
|
||||||
print_error "Command failed."
|
print_error "Command failed."
|
||||||
log_message "Command failed: $cmd"
|
log_message "Command failed: $cmd"
|
||||||
|
|||||||
Reference in New Issue
Block a user