From 6c4adb0a6fba0ab1f0b3b9cb166629d940e22d1f Mon Sep 17 00:00:00 2001 From: "Esteban Mackay Q." Date: Sun, 2 Jun 2024 02:14:01 -0500 Subject: [PATCH] . --- install.sh | 33 +++++++++++++-------------------- update.sh | 20 ++++++++------------ 2 files changed, 21 insertions(+), 32 deletions(-) diff --git a/install.sh b/install.sh index 21ce8e0..e5b5bd0 100644 --- a/install.sh +++ b/install.sh @@ -114,33 +114,26 @@ then fi ########################################################## -if [ -d "/var/log/ADN" ] -then - sudo rm -rf /var/log/ADN +if [ -d "/var/log/ADN" ];then + sudo rm -r /var/log/ADN 2>/dev/null fi -if [ -d "/opt/ADN-DMR-Peer-Server" ] -then - sudo rm -rf /opt/ADN-DMR-Peer-Server +if [ -d "/opt/ADN-DMR-Peer-Server" ];then + sudo rm -r /opt/ADN-DMR-Peer-Server 2>/dev/null fi -if [ -d "/var/www/fdmr2" ] -then - sudo rm -rf /var/www/fdmr2 +if [ -d "/var/www/fdmr2" ];then + sudo rm -r /var/www/fdmr2 2>/dev/null fi -if [ -d "/opt/FDMR-Monitor2" ] -then - sudo rm -rf /opt/FDMR-Monitor2 +if [ -d "/opt/FDMR-Monitor2" ];then + sudo rm -r /opt/FDMR-Monitor2 2>/dev/null fi -if [ -d "/var/www/fdmr" ] -then - sudo rm -rf /var/www/fdmr +if [ -d "/var/www/fdmr" ];then + sudo rm -r /var/www/fdmr 2>/dev/null fi -if [ -d "/opt/FDMR-Monitor" ] -then - sudo rm -rf /opt/FDMR-Monitor +if [ -d "/opt/FDMR-Monitor" ];then + sudo rm -r /opt/FDMR-Monitor 2>/dev/null fi ############################### -if [ -f "/bin/menu-fdmr" ]; -then +if [ -f "/bin/menu-fdmr" ];then rm /bin/menu-fdmr #echo "found file" else diff --git a/update.sh b/update.sh index cecb730..3da21d4 100644 --- a/update.sh +++ b/update.sh @@ -551,13 +551,11 @@ WantedBy=multi-user.target EOF # -if [ -d "/var/www/fdmr" ] -then - sudo rm -rf /var/www/fdmr +if [ -d "/var/www/fdmr" ];then + sudo rm -r /var/www/fdmr 2>/dev/null fi -if [ -d "/opt/FDMR-Monitor" ] -then - sudo rm -rf /opt/FDMR-Monitor +if [ -d "/opt/FDMR-Monitor" ];then + sudo rm -r /opt/FDMR-Monitor 2>/dev/null fi ######################### #lamp @@ -824,13 +822,11 @@ sudo systemctl stop fdmr_mon2.service ############################################################ cd / -if [ -d "/var/www/fdmr2" ] -then - sudo rm -rf /var/www/fdmr2 +if [ -d "/var/www/fdmr2" ]; then + sudo rm -r /var/www/fdmr2 2>/dev/null fi -if [ -d "/opt/FDMR-Monitor2" ] -then - sudo rm -rf /opt/FDMR-Monitor2 +if [ -d "/opt/FDMR-Monitor2" ];then + sudo rm -r /opt/FDMR-Monitor2 2>/dev/null fi if [ ! -d "/var/www" ] then