From 2e6f7fd3e56f64d0fdc9a9d5df3787e5af4b1e93 Mon Sep 17 00:00:00 2001 From: Carter Maxwell Date: Sat, 7 May 2016 00:59:56 -0700 Subject: [PATCH] replace toilet with echo --- advanced/Scripts/chronometer.sh | 6 +++++- automated install/basic-install.sh | 2 +- automated install/uninstall.sh | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/advanced/Scripts/chronometer.sh b/advanced/Scripts/chronometer.sh index 1c8a53c9..b3d9b5ed 100755 --- a/advanced/Scripts/chronometer.sh +++ b/advanced/Scripts/chronometer.sh @@ -84,7 +84,11 @@ function normalChrono(){ do clear # Displays a colorful Pi-hole logo - toilet -f small -F gay Pi-hole + echo " ___ _ _ _ " + echo "| _ (_)___| |_ ___| |___ " + echo "| _/ |___| ' \/ _ \ / -_)" + echo "|_| |_| |_||_\___/_\___|" + echo "" echo " $(ifconfig eth0 | awk '/inet addr/ {print $2}' | cut -d':' -f2)" echo "" uptime | cut -d' ' -f11- diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 139a7a4b..dd42278e 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -546,7 +546,7 @@ checkForDependencies() { echo ":::" echo "::: Checking dependencies:" - dependencies=( dnsutils bc toilet figlet dnsmasq lighttpd php5-common php5-cgi php5 git curl unzip wget ) + dependencies=( dnsutils bc dnsmasq lighttpd php5-common php5-cgi php5 git curl unzip wget ) for i in "${dependencies[@]}"; do echo -n "::: Checking for $i..." if [ "$(dpkg-query -W -f='${Status}' "$i" 2>/dev/null | grep -c "ok installed")" -eq 0 ]; then diff --git a/automated install/uninstall.sh b/automated install/uninstall.sh index 484a544d..2d32b52d 100755 --- a/automated install/uninstall.sh +++ b/automated install/uninstall.sh @@ -44,7 +44,7 @@ function removeAndPurge { # Purge dependencies echo ":::" # Nate 3/28/2016 - Removed `php5-cgi` and `php5` as they are removed with php5-common - dependencies=( dnsutils bc toilet figlet dnsmasq lighttpd php5-common git curl unzip wget ) + dependencies=( dnsutils bc dnsmasq lighttpd php5-common git curl unzip wget ) for i in "${dependencies[@]}"; do if [ "$(dpkg-query -W --showformat='${Status}\n' "$i" 2> /dev/null | grep -c "ok installed")" -eq 1 ]; then while true; do