feat: postgresql,docker,traefik,authelia,yq

README.md

@@ -342,6 +342,8 @@ wget https://woniuzfb.github.io/iptv/iptv.sh && bash iptv.sh
 
 - traefik
 - authelia
+- postgresql
+- yq
 
 </details>
 

build

@@ -11,7 +11,7 @@ ReplaceInclude()
         echo "${2:-}if [ \"\$self\" == \"tv\" ] || [ \"\$self\" == \"iptv\" ]"
         echo "${2:-}then"
         ReplaceInclude src/tv "    ${2:-}"
-        bins=(v2 x nx or pve arm ibm cf cx ali lhh rc cw)
+        bins=(v2 x nx or pve arm ibm cf cx ali lhh rc cw dr)
         for bin in "${bins[@]}"
         do
             echo "${2:-}elif [ \"\$self\" == \"$bin\" ]"

core

@@ -272,17 +272,11 @@ WaitTerm()
 }
 
 Include utils/system "$@"
-
 Include utils/inquirer "$@"
-
 Include utils/spinner "$@"
-
 Include utils/progress "$@"
-
 Include utils/shfile "$@"
-
 Include utils/jq "$@"
-
+Include utils/git "$@"
 Include utils/curl "$@"
-
 Include utils/log

docs/iptv.sh

@@ -676,10 +676,7 @@ DepsInstall()
 # based on https://raw.githubusercontent.com/tanhauhau/Inquirer.sh/master/dist/inquirer.sh
 inquirer()
 {
-    if [[ ! -x $(command -v tput) ]] 
-    then
-        DepInstall tput
-    fi
+    DepInstall tput
 
     inquirer:print() {
         tput el
@@ -2214,6 +2211,7 @@ inquirer()
         if [ "$list_count" -eq 1 ] 
         then
             inquirer:print "${green}?${normal} ${bold}${bg_black}${white}${prompt} ${bg_black}${cyan}${list_options[current_index]}${normal}\n"
+            page_list=("${list_options[@]}")
             return
         fi
 
@@ -2460,11 +2458,12 @@ inquirer()
 
         trap inquirer:control_c EXIT
 
-        stty -echo
-        tput cnorm
+        #stty -echo
+        #tput cnorm
 
-        inquirer:on_keypress inquirer:on_default inquirer:on_default inquirer:on_text_input_ascii inquirer:on_text_input_enter inquirer:on_text_input_left inquirer:on_text_input_right inquirer:on_text_input_ascii inquirer:on_text_input_backspace inquirer:on_text_input_not_ascii
-        read -r ${var_name?} <<< "$text_input"
+        read -e text_input
+        #inquirer:on_keypress inquirer:on_default inquirer:on_default inquirer:on_text_input_ascii inquirer:on_text_input_enter inquirer:on_text_input_left inquirer:on_text_input_right inquirer:on_text_input_ascii inquirer:on_text_input_backspace inquirer:on_text_input_not_ascii
+        read -r ${var_name?} <<< "${text_input:-$text_default}"
 
         inquirer:cleanup
 

env

@@ -28,6 +28,7 @@ ARM_FILE=/usr/local/bin/arm
 PVE_FILE=/usr/local/bin/pve
 LOG_FILE="$HOME"/iptv.log
 JQ_FILE=/usr/local/bin/jq
+YQ_FILE=/usr/local/bin/yq
 FFMPEG_FILE=/usr/local/bin/ffmpeg
 FFPROBE_FILE=/usr/local/bin/ffprobe
 CURL_IMPERSONATE_FILE=/usr/local/bin/curl-impersonate
@@ -127,3 +128,12 @@ CALIBRE_ROOT="$SERVICES_ROOT"/calibre
 # Kcc
 KCC_ROOT="$CALIBRE_ROOT"/kcc
 KCC_FILE="$KCC_ROOT"/kcc-c2e.py
+
+# docker
+DOCKER_FILE=/usr/local/bin/dr
+DOCKER_ROOT="$SERVICES_ROOT"/docker
+DOCKER_CONFIG="$SERVICES_ROOT"/docker/docker-compose.yml
+
+# aios
+AIOS_LINK=https://github.com/woniuzfb/iptv
+AIOS_ROOT="$SERVICES_ROOT"/aios

iptv.sh

@@ -676,10 +676,7 @@ DepsInstall()
 # based on https://raw.githubusercontent.com/tanhauhau/Inquirer.sh/master/dist/inquirer.sh
 inquirer()
 {
-    if [[ ! -x $(command -v tput) ]] 
-    then
-        DepInstall tput
-    fi
+    DepInstall tput
 
     inquirer:print() {
         tput el
@@ -2214,6 +2211,7 @@ inquirer()
         if [ "$list_count" -eq 1 ] 
         then
             inquirer:print "${green}?${normal} ${bold}${bg_black}${white}${prompt} ${bg_black}${cyan}${list_options[current_index]}${normal}\n"
+            page_list=("${list_options[@]}")
             return
         fi
 
@@ -2460,11 +2458,12 @@ inquirer()
 
         trap inquirer:control_c EXIT
 
-        stty -echo
-        tput cnorm
+        #stty -echo
+        #tput cnorm
 
-        inquirer:on_keypress inquirer:on_default inquirer:on_default inquirer:on_text_input_ascii inquirer:on_text_input_enter inquirer:on_text_input_left inquirer:on_text_input_right inquirer:on_text_input_ascii inquirer:on_text_input_backspace inquirer:on_text_input_not_ascii
-        read -r ${var_name?} <<< "$text_input"
+        read -e text_input
+        #inquirer:on_keypress inquirer:on_default inquirer:on_default inquirer:on_text_input_ascii inquirer:on_text_input_enter inquirer:on_text_input_left inquirer:on_text_input_right inquirer:on_text_input_ascii inquirer:on_text_input_backspace inquirer:on_text_input_not_ascii
+        read -r ${var_name?} <<< "${text_input:-$text_default}"
 
         inquirer:cleanup
 

make

@@ -1,5 +1,5 @@
 #!/bin/bash
-# LianHuanHua / Rclone / Alist / Calibre / FFmpeg / Nginx / Openresty / V2ray / Xray / Cloudflare / IBM Cloud Foundry / Armbian / Proxmox VE / ...
+# Docker / LianHuanHua / Rclone / Alist / Calibre / FFmpeg / Nginx / Openresty / V2ray / Xray / Cloudflare / IBM Cloud Foundry / Armbian / Proxmox VE / ...
 # Copyright (C) 2019-2024
 # Released under GPL Version 3 License
 

scripts/build.sh

@@ -1548,6 +1548,7 @@ inquirer()
         if [ "$list_count" -eq 1 ] 
         then
             inquirer:print "${green}?${normal} ${bold}${bg_black}${white}${prompt} ${bg_black}${cyan}${list_options[current_index]}${normal}\n"
+            page_list=("${list_options[@]}")
             return
         fi
 
@@ -1794,11 +1795,12 @@ inquirer()
 
         trap inquirer:control_c EXIT
 
-        stty -echo
-        tput cnorm
+        #stty -echo
+        #tput cnorm
 
-        inquirer:on_keypress inquirer:on_default inquirer:on_default inquirer:on_text_input_ascii inquirer:on_text_input_enter inquirer:on_text_input_left inquirer:on_text_input_right inquirer:on_text_input_ascii inquirer:on_text_input_backspace inquirer:on_text_input_not_ascii
-        read -r ${var_name?} <<< "$text_input"
+        read -e text_input
+        #inquirer:on_keypress inquirer:on_default inquirer:on_default inquirer:on_text_input_ascii inquirer:on_text_input_enter inquirer:on_text_input_left inquirer:on_text_input_right inquirer:on_text_input_ascii inquirer:on_text_input_backspace inquirer:on_text_input_not_ascii
+        read -r ${var_name?} <<< "${text_input:-$text_default}"
 
         inquirer:cleanup