mirror of
https://gitlab.com/amrron/setup-scripts.git
synced 2026-10-17 01:54:00 -04:00
color coding and cleanup
This commit is contained in:
+19
-43
@@ -1,9 +1,9 @@
|
||||
#!/bin/bash
|
||||
################################################################################
|
||||
################################################################################
|
||||
######################## AmRRON Setup Script v1.2.5.1 ########################
|
||||
######################## AmRRON Setup Script v1.2.7 ########################
|
||||
######################## Created by TB-14 ########################
|
||||
######################## 27 JUN 2025 ########################
|
||||
######################## 01 JUL 2025 ########################
|
||||
################################################################################
|
||||
################################################################################
|
||||
#
|
||||
@@ -50,22 +50,30 @@
|
||||
################################################################################
|
||||
################################################################################
|
||||
# Ask for the administrator password upfront
|
||||
ACTION='\033[1;90m' #gray
|
||||
FINISHED='\033[1;96m' #cyan
|
||||
READY='\033[1;92m' #green
|
||||
NOCOLOR='\033[0m' # No Color
|
||||
ERROR='\033[0;31m'
|
||||
|
||||
|
||||
clear;echo
|
||||
echo "###########################################"
|
||||
echo -e ${FINISHED}"###########################################"
|
||||
echo "###########################################"
|
||||
echo "╔═╗╔╦╗╦═╗╦═╗╔═╗╔╗╔ ╔═╗╔═╗╦═╗╔═╗╔═╗";
|
||||
echo "╠═╣║║║╠╦╝╠╦╝║ ║║║║ ║ ║ ║╠╦╝╠═╝╚═╗";
|
||||
echo "╩ ╩╩ ╩╩╚═╩╚═╚═╝╝╚╝ ╚═╝╚═╝╩╚═╩ ╚═╝";
|
||||
echo "###########################################"
|
||||
echo "###########################################"
|
||||
echo -e "###########################################"${NOCOLOR}
|
||||
|
||||
if $(sudo -n true); then
|
||||
echo "sudo is active"
|
||||
echo -e $"sudo is active"
|
||||
else
|
||||
echo -e ${ACTION}
|
||||
echo "You will be prompted for your sudo password"
|
||||
echo "below in order to install dependencies."
|
||||
echo "###########################################"
|
||||
echo "###########################################"
|
||||
echo -e "###########################################"${NOCOLOR}
|
||||
sudo -v
|
||||
|
||||
# Keep-alive: update existing `sudo` time stamp until script has finished
|
||||
@@ -158,38 +166,6 @@ echo "${ERRCODE}" >> /tmp/failures
|
||||
}
|
||||
|
||||
|
||||
### Check if scripts are up to date
|
||||
|
||||
|
||||
function check_repo_version() {
|
||||
|
||||
echo "To ensure your scripts are up to date with current features and fixes, \
|
||||
Quit this installer and run the command
|
||||
|
||||
git pull
|
||||
|
||||
in the setup-scripts directory and then relaunch the scripts. If your repo is up to \
|
||||
date, click continue." | yad \
|
||||
--image=$DIR/images/corps-icon.png \
|
||||
--center \
|
||||
--text-info \
|
||||
--wrap \
|
||||
--button="Quit:1" \
|
||||
--button="Continue:0" \
|
||||
--title "Ensure your scripts are up to date." \
|
||||
${r} ${c}
|
||||
rc=$?
|
||||
if [[ $rc == 0 ]]; then
|
||||
echo "Continuing with current version"
|
||||
elif [[ $rc == 1 ]]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
}
|
||||
|
||||
# Set variables used in the script.
|
||||
|
||||
# Determine what is already installed.
|
||||
function check_installed_programs() {
|
||||
|
||||
@@ -1842,10 +1818,11 @@ cd $USERDIR && git clone https://github.com/W5DMH/commstatone.git ||
|
||||
cd $USERDIR/commstatone && chmod +x linuxinstall.sh ||
|
||||
{ ERRCODE="Failed to make linuxinstall.sh executable."; errors; return; }
|
||||
|
||||
echo comstatone >> /tmp/cleanup
|
||||
else
|
||||
echo "Comstat install has not been tested on your distribution."
|
||||
|
||||
if [[ $OSCN =~ una|vanessa|vera|virginia ]]; then
|
||||
echo comstatone >> /tmp/cleanup
|
||||
else
|
||||
echo "Comstat install has not been tested on your distribution."
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ $OSCN =~ wilma|xia ]]; then
|
||||
@@ -4893,7 +4870,6 @@ check_for_updates
|
||||
yad_install
|
||||
set_screen_size
|
||||
check_os_support
|
||||
#check_repo_version
|
||||
check_installed_programs
|
||||
query_updates
|
||||
add_dialout
|
||||
|
||||
Reference in New Issue
Block a user