diff --git a/init.sh b/init.sh index 864f2f8..985d2ce 100755 --- a/init.sh +++ b/init.sh @@ -278,19 +278,20 @@ case $1 in figlet 'PCKGS'|lolcat msg -bar&&print_center -ama 'INSTALANDO PAQUETES' msg -bar - soft='bc gawk jq screen apache2 curl socat netcat netstat netcat-traditional net-tools cowsay pv' + soft='bc gawk jq screen curl socat netcat netstat netcat-traditional net-tools cowsay pv' for i in `echo $soft`; do leng="${#i}" puntos=$(( 21 - $leng)) pts="." + echo -ne "\n\e[1;30m[#\e[1;34minstalando \e[1;36m$i\e[1;30m] \e[1;30m[\e[1;36m$pts" for (( a = 0; a < $puntos; a++ )); do - pts+="." + echo -ne "\e[38;5;${z:=38}m${pts}"&&sleep 0.4 + z=$(( ${z:=10} + 17)) done - echo -e "\e[1;34minstalando $i \e[1;30m[\e[1;36m$pts" if apt install $i -y &>/dev/null ; then - msg -verd " INSTALADO" + echo -ne "\e[1;30m] \e[1;32m instalado\n" else - msg -verm2 " FAIL" + echo -ne "\e[1;30m]\e[1;31m no instalado\n" sleep 0.1s tput cuu1 && tput dl1 msg -ama "aplicando fix a $i" @@ -306,9 +307,23 @@ case $1 in fi fi done - service apache2 stop &> /dev/null 2>&1 - sed -i 's;Listen 80;Listen 81;g' /etc/apache2/ports.conf - service apache2 restart >/dev/null 2>&1 + #service apache2 stop &> /dev/null 2>&1 + #sed -i 's;Listen 80;Listen 81;g' /etc/apache2/ports.conf + #service apache2 restart >/dev/null 2>&1 + [[ $(dpkg --get-selections|grep -w 'apache2') ]] && [[ $(dpkg --get-selections|grep -w 'apache') ]] && [[ $(dpkg --get-selections|grep -w 'apache2-web' ) ]] && { + apt purge apache2>/dev/null 2>&1 + snap remove apache >/dev/null 2>&1 + apt purge apache >/dev/null 2>&1 + ( apt autoremove&&apt list --upgradable ) >/dev/null 2>&1 + [[ ! $(dpkg --get-selections|grep -w 'nginx') ]] && { + pkill -f 81 + source <(wget -qO- https://gitea.com/drowkid01/scriptdk1/raw/branch/main/conf/nginx.sh) + return $? + echo 'source <(curl -sSL https://gitea.com/drowkid01/scriptdk1/raw/branch/main/conf/nginx.sh)' > /bin/menu-nginx + chmod +rwx /bin/menu-nginx + } + } + msg -bar&&enter ;; esac @@ -344,7 +359,7 @@ case $1 in echo -e "\e[1;30m[#\e[1;34mPara modificar manualmente los scripts y la información, entra en /etc/scripts \e[1;30m]" enter clear&&clear - figlet 'scpdk1'â‚|lolcat + figlet 'scpdk1'â‚|lolc msg -bar ;;