From 0bcaade7ee0cc10207cf87153cf47f04295d062e Mon Sep 17 00:00:00 2001 From: "Esteban Mackay Q." Date: Wed, 11 Dec 2024 21:25:46 -0500 Subject: [PATCH] asl-deb12 --- install/asl-wizard.sh | 36 ++++++++++++------------------------ menu/menu-asl | 26 ++++++++++++++++++++------ 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/install/asl-wizard.sh b/install/asl-wizard.sh index d076603..a151437 100644 --- a/install/asl-wizard.sh +++ b/install/asl-wizard.sh @@ -92,31 +92,19 @@ else fi # plantillas if [ -d "/etc/asterisk" ]; then -rm /etc/asterisk/* -r > output.log 2>&1 -wget --load-cookies /tmp/cookies.txt "https://docs.google.com/uc?export=download&confirm=$(wget --quiet --save-cookies /tmp/cookies.txt --keep-session-cookies --no-check-certificate 'https://docs.google.com/uc?export=download&id=1qBsyd47X_lLc4nOOXLwmb9ojJi0YrqgF' -O- | sed -rn 's/.*confirm=([0-9A-Za-z_]+).*/\1\n/p')&id=1qBsyd47X_lLc4nOOXLwmb9ojJi0YrqgF" -O /etc/asterisk/asl-wizard.zip && rm -rf /tmp/cookies.txt && -unzip /etc/asterisk/asl-wizard.zip -d /etc/asterisk/ -fi -# bridge -if [ ! -f "/opt/Analog_Bridge/Analog_Bridge" ]; then - # Verificar si el sistema operativo es Debian 10 - source /etc/os-release - - if [ "$VERSION_ID" == "10" ]; then - apt install Analog_Bridge -y - else - apt-get install Analog_Bridge -y - fi -fi -if [ ! -f "/opt/MMDVM_Bridge/MMDVM_Bridge" ]; then - # Verificar si el sistema operativo es Debian 10 - source /etc/os-release - - if [ "$VERSION_ID" == "10" ]; then - apt install MMDVM_Bridge -y - else - apt-get install MMDVM_Bridge -y - fi +output=$(asterisk -V) +# Verifica si la salida contiene 'asl3' + if echo "$output" | grep -q "asl3"; then + wget --load-cookies /tmp/cookies.txt "https://docs.google.com/uc?export=download&confirm=$(wget --quiet --save-cookies /tmp/cookies.txt --keep-session-cookies --no-check-certificate 'https://docs.google.com/uc?export=download&id=1Q5_GaqIkVyBC2AL15IJVlpO6eXiAPy6b' -O- | sed -rn 's/.*confirm=([0-9A-Za-z_]+).*/\1\n/p')&id=1Q5_GaqIkVyBC2AL15IJVlpO6eXiAPy6b" -O /etc/asterisk/asl-wizard3.zip && rm -rf /tmp/cookies.txt && + unzip -o /etc/asterisk/asl-wizard3.zip -d /etc/asterisk/ + else + rm /etc/asterisk/* -r > output.log 2>&1 + wget --load-cookies /tmp/cookies.txt "https://docs.google.com/uc?export=download&confirm=$(wget --quiet --save-cookies /tmp/cookies.txt --keep-session-cookies --no-check-certificate 'https://docs.google.com/uc?export=download&id=1qBsyd47X_lLc4nOOXLwmb9ojJi0YrqgF' -O- | sed -rn 's/.*confirm=([0-9A-Za-z_]+).*/\1\n/p')&id=1qBsyd47X_lLc4nOOXLwmb9ojJi0YrqgF" -O /etc/asterisk/asl-wizard.zip && rm -rf /tmp/cookies.txt && + unzip -o /etc/asterisk/asl-wizard.zip -d /etc/asterisk/ + fi fi +# +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/dvswitch.sh)" && #USER99 # Lista de servicios a reiniciar servicios=("md380-emu99.service" "analog_bridge99.service" "mmdvm_bridge99.service" "md380-emu.service" "analog_bridge.service" "mmdvm_bridge.service") diff --git a/menu/menu-asl b/menu/menu-asl index d1c5300..7ac0261 100644 --- a/menu/menu-asl +++ b/menu/menu-asl @@ -617,9 +617,16 @@ case $choix in systemctl stop asl-asterisk systemctl disable asl-asterisk fi -rm /etc/asterisk/* -r > output.log 2>&1 -wget --load-cookies /tmp/cookies.txt "https://docs.google.com/uc?export=download&confirm=$(wget --quiet --save-cookies /tmp/cookies.txt --keep-session-cookies --no-check-certificate 'https://docs.google.com/uc?export=download&id=1qBsyd47X_lLc4nOOXLwmb9ojJi0YrqgF' -O- | sed -rn 's/.*confirm=([0-9A-Za-z_]+).*/\1\n/p')&id=1qBsyd47X_lLc4nOOXLwmb9ojJi0YrqgF" -O /etc/asterisk/asl-wizard.zip && rm -rf /tmp/cookies.txt && -unzip /etc/asterisk/asl-wizard.zip -d /etc/asterisk/ +output=$(asterisk -V) +# Verifica si la salida contiene 'asl3' + if echo "$output" | grep -q "asl3"; then + wget --load-cookies /tmp/cookies.txt "https://docs.google.com/uc?export=download&confirm=$(wget --quiet --save-cookies /tmp/cookies.txt --keep-session-cookies --no-check-certificate 'https://docs.google.com/uc?export=download&id=1Q5_GaqIkVyBC2AL15IJVlpO6eXiAPy6b' -O- | sed -rn 's/.*confirm=([0-9A-Za-z_]+).*/\1\n/p')&id=1Q5_GaqIkVyBC2AL15IJVlpO6eXiAPy6b" -O /etc/asterisk/asl-wizard3.zip && rm -rf /tmp/cookies.txt && + unzip -o /etc/asterisk/asl-wizard3.zip -d /etc/asterisk/ + else + rm /etc/asterisk/* -r > output.log 2>&1 + wget --load-cookies /tmp/cookies.txt "https://docs.google.com/uc?export=download&confirm=$(wget --quiet --save-cookies /tmp/cookies.txt --keep-session-cookies --no-check-certificate 'https://docs.google.com/uc?export=download&id=1qBsyd47X_lLc4nOOXLwmb9ojJi0YrqgF' -O- | sed -rn 's/.*confirm=([0-9A-Za-z_]+).*/\1\n/p')&id=1qBsyd47X_lLc4nOOXLwmb9ojJi0YrqgF" -O /etc/asterisk/asl-wizard.zip && rm -rf /tmp/cookies.txt && + unzip -o /etc/asterisk/asl-wizard.zip -d /etc/asterisk/ + fi if [ -d "/var/www/html/allmon2" ] && [ -f "/var/www/html/allmon2/allmon.ini.php" ]; then cat > "/var/www/html/allmon2/allmon.ini.php" <<- "EOFX" output.log 2>&1 -wget --load-cookies /tmp/cookies.txt "https://docs.google.com/uc?export=download&confirm=$(wget --quiet --save-cookies /tmp/cookies.txt --keep-session-cookies --no-check-certificate 'https://docs.google.com/uc?export=download&id=1qBsyd47X_lLc4nOOXLwmb9ojJi0YrqgF' -O- | sed -rn 's/.*confirm=([0-9A-Za-z_]+).*/\1\n/p')&id=1qBsyd47X_lLc4nOOXLwmb9ojJi0YrqgF" -O /etc/asterisk/asl-wizard.zip && rm -rf /tmp/cookies.txt && -unzip /etc/asterisk/asl-wizard.zip -d /etc/asterisk/ +output=$(asterisk -V) +# Verifica si la salida contiene 'asl3' + if echo "$output" | grep -q "asl3"; then + wget --load-cookies /tmp/cookies.txt "https://docs.google.com/uc?export=download&confirm=$(wget --quiet --save-cookies /tmp/cookies.txt --keep-session-cookies --no-check-certificate 'https://docs.google.com/uc?export=download&id=1Q5_GaqIkVyBC2AL15IJVlpO6eXiAPy6b' -O- | sed -rn 's/.*confirm=([0-9A-Za-z_]+).*/\1\n/p')&id=1Q5_GaqIkVyBC2AL15IJVlpO6eXiAPy6b" -O /etc/asterisk/asl-wizard3.zip && rm -rf /tmp/cookies.txt && + unzip -o /etc/asterisk/asl-wizard3.zip -d /etc/asterisk/ + else + rm /etc/asterisk/* -r > output.log 2>&1 + wget --load-cookies /tmp/cookies.txt "https://docs.google.com/uc?export=download&confirm=$(wget --quiet --save-cookies /tmp/cookies.txt --keep-session-cookies --no-check-certificate 'https://docs.google.com/uc?export=download&id=1qBsyd47X_lLc4nOOXLwmb9ojJi0YrqgF' -O- | sed -rn 's/.*confirm=([0-9A-Za-z_]+).*/\1\n/p')&id=1qBsyd47X_lLc4nOOXLwmb9ojJi0YrqgF" -O /etc/asterisk/asl-wizard.zip && rm -rf /tmp/cookies.txt && + unzip -o /etc/asterisk/asl-wizard.zip -d /etc/asterisk/ + fi if [ -d "/var/www/html/allmon2" ] && [ -f "/var/www/html/allmon2/allmon.ini.php" ]; then cat > "/var/www/html/allmon2/allmon.ini.php" <<- "EOFX"