rm unused files

shells/box.sh

@@ -1,16 +1,5 @@
 #!/bin/bash
-# wget -O box.sh https://raw.githubusercontent.com/wukongdaily/tvhelper/master/shells/box.sh && chmod +x box.sh && ./box.sh
-
-#判断是否为x86软路由
-is_x86_64_router() {
-    DISTRIB_ARCH=$(cat /etc/openwrt_release | grep "DISTRIB_ARCH" | cut -d "'" -f 2)
-    if [ "$DISTRIB_ARCH" = "x86_64" ]; then
-        return 0
-    else
-        return 1
-    fi
-}
-
+# wget -O box.sh https://raw.githubusercontent.com/wukongdaily/tvhelper-docker/master/shells/box.sh && chmod +x box.sh && ./box.sh
 #********************************************************
 
 # 定义红色文本
@@ -34,54 +23,23 @@ is_integer() {
     fi
 }
 
-# 判断adb是否安装
-check_adb_installed() {
-    if opkg list-installed | grep -q "^adb "; then
-        return 0 # 表示 adb 已安装
-    else
-        return 1 # 表示 adb 未安装
-    fi
-}
-
 # 判断adb是否连接成功
 check_adb_connected() {
-    if check_adb_installed; then
-        # 获取 adb devices 输出,跳过第一行（标题行）,并检查每一行的状态
-        local connected_devices=$(adb devices | awk 'NR>1 {print $2}' | grep 'device$')
-        # 检查是否有设备已连接并且状态为 'device',即已授权
-        if [[ -n $connected_devices ]]; then
-            # ADB 已连接并且设备已授权
-            return 0
-        else
-            # ADB 设备未连接或未授权
-            return 1
-        fi
+    # 获取 adb devices 输出,跳过第一行（标题行）,并检查每一行的状态
+    local connected_devices=$(adb devices | awk 'NR>1 {print $2}' | grep 'device$')
+    # 检查是否有设备已连接并且状态为 'device',即已授权
+    if [[ -n $connected_devices ]]; then
+        # ADB 已连接并且设备已授权
+        return 0
     else
-        # 表示 adb 未安装
+        # ADB 设备未连接或未授权
         return 1
     fi
 }
 
-# 安装adb工具
-install_adb() {
-    echo -e "${BLUE}绝大多数软路由自带ADB 只有少数OpenWrt硬路由才需要安装ADB${NC}"
-    # 调用函数并根据返回值判断
-    if check_adb_installed; then
-        echo -e "${YELLOW}您的路由器已经安装了ADB工具${NC}"
-    else
-        opkg update
-        echo -e "${YELLOW}正在尝试安装adb${NC}"
-        if opkg install adb; then
-            echo -e "${GREEN}adb 安装成功!${NC}"
-        else
-            echo -e "${RED}adb 安装失败,请检查日志以获取更多信息。${NC}"
-        fi
-    fi
-}
 
 # 连接adb
 connect_adb() {
-    install_adb
 
     # 尝试自动获取网关地址
     #gateway_ip=$(ip route show default | grep default | awk '{print $3}')
@@ -136,7 +94,6 @@ disconnect_adb() {
     fi
 }
 
-
 get_status() {
     if check_adb_connected; then
         adb_status="${GREEN}已连接且已授权${NC}"
@@ -190,17 +147,6 @@ check_github_connected() {
     fi
 }
 
-##获取软路由型号信息
-get_router_name() {
-    if is_x86_64_router; then
-        model_name=$(grep "model name" /proc/cpuinfo | head -n 1 | awk -F: '{print $2}' | sed 's/^[ \t]*//;s/[ \t]*$//')
-        echo "$model_name"
-    else
-        model_info=$(cat /tmp/sysinfo/model)
-        echo "$model_info"
-    fi
-}
-
 # 安装apk
 install_apk() {
     local apk_download_url=$1
@@ -242,23 +188,20 @@ install_apk() {
     fi
 }
 
-
 # 安装TVBox
-install_tvbox(){
+install_tvbox() {
     install_apk "https://github.com/wukongdaily/tvhelper/raw/master/apks/TVBox.apk" "com.github.tvbox.osc.wk"
 }
 
-sponsor(){
+sponsor() {
     echo
     echo -e "${GREEN}访问赞助页面和悟空百科⬇${BLUE}"
     echo -e "${BLUE} https://bit.ly/3woDZE7 ${NC}"
-    echo 
+    echo
 }
 
-
 # 菜单
 menu_options=(
-    "安装ADB"
     "连接ADB"
     "断开ADB"
     "安装TVBox(基于takagen99/Box源码打包)"
@@ -266,7 +209,6 @@ menu_options=(
 )
 
 commands=(
-    ["安装ADB"]="install_adb"
     ["连接ADB"]="connect_adb"
     ["断开ADB"]="disconnect_adb"
     ["安装TVBox(基于takagen99/Box源码打包)"]="install_tvbox"
@@ -314,12 +256,11 @@ show_menu() {
     mkdir -p /tmp/upload
     clear
     echo "***********************************************************************"
-    echo -e "*      ${YELLOW}TVBOX助手 OpenWrt版 (${current_date})${NC}        "
-    echo -e "*      ${RED}请确保电视盒子和OpenWrt路由器处于${NC}${BLUE}同一网段${NC}\n*      ${RED}且电视盒子开启了${NC}${BLUE}USB调试模式(adb开关)${NC}         "
+    echo -e "*      ${YELLOW}TVBOX助手 Docker版 (${current_date})${NC}        "
+    echo -e "*      ${RED}请确保电视盒子和Docker宿主机处于${NC}${BLUE}同一网段${NC}\n*      ${RED}且电视盒子开启了${NC}${BLUE}USB调试模式(adb开关)${NC}         "
     echo "*      Developed by @wukongdaily        "
     echo "**********************************************************************"
     echo
-    echo "*      当前的路由器型号: $(get_router_name)"
     echo "$(check_github_connected)"
     echo "$(get_status)"
     echo "$(get_tvbox_model_name)"

shells/env.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-# MT3000/2500/6000 没有bash 需要先安装
-# wget -O env.sh https://raw.githubusercontent.com/wukongdaily/tvhelper/master/shells/env.sh && chmod +x env.sh && ./env.sh
-check_bash_installed() {
-  if [ -x "/bin/bash" ]; then
-    echo "downloading tv.sh ......"
-  else
-    echo "install bash env ......"
-    opkg update
-    opkg install bash
-  fi
-}
-check_bash_installed
-wget -O tv.sh https://raw.githubusercontent.com/wukongdaily/tvhelper/master/shells/tv.sh && chmod +x tv.sh && ./tv.sh

shells/kodi.sh

@@ -1,15 +1,5 @@
 #!/bin/bash
-# wget -O kodi.sh https://raw.githubusercontent.com/wukongdaily/tvhelper/master/shells/kodi.sh && chmod +x kodi.sh && ./kodi.sh
-
-#判断是否为x86软路由
-is_x86_64_router() {
-    DISTRIB_ARCH=$(cat /etc/openwrt_release | grep "DISTRIB_ARCH" | cut -d "'" -f 2)
-    if [ "$DISTRIB_ARCH" = "x86_64" ]; then
-        return 0
-    else
-        return 1
-    fi
-}
+# wget -O kodi.sh https://raw.githubusercontent.com/wukongdaily/tvhelper-helper/master/shells/kodi.sh && chmod +x kodi.sh && ./kodi.sh
 
 #********************************************************
 

shells/sony.sh

@@ -1,16 +1,5 @@
 #!/bin/bash
-# wget -O sony.sh https://raw.githubusercontent.com/wukongdaily/tvhelper/master/shells/sony.sh && chmod +x sony.sh && ./sony.sh
-
-#判断是否为x86软路由
-is_x86_64_router() {
-    DISTRIB_ARCH=$(cat /etc/openwrt_release | grep "DISTRIB_ARCH" | cut -d "'" -f 2)
-    if [ "$DISTRIB_ARCH" = "x86_64" ]; then
-        return 0
-    else
-        return 1
-    fi
-}
-
+# wget -O sony.sh https://raw.githubusercontent.com/wukongdaily/tvhelper-docker/master/shells/sony.sh && chmod +x sony.sh && ./sony.sh
 #********************************************************
 
 # 定义红色文本
@@ -34,54 +23,22 @@ is_integer() {
     fi
 }
 
-# 判断adb是否安装
-check_adb_installed() {
-    if opkg list-installed | grep -q "^adb "; then
-        return 0 # 表示 adb 已安装
-    else
-        return 1 # 表示 adb 未安装
-    fi
-}
-
 # 判断adb是否连接成功
 check_adb_connected() {
-    if check_adb_installed; then
-        # 获取 adb devices 输出,跳过第一行（标题行）,并检查每一行的状态
-        local connected_devices=$(adb devices | awk 'NR>1 {print $2}' | grep 'device$')
-        # 检查是否有设备已连接并且状态为 'device',即已授权
-        if [[ -n $connected_devices ]]; then
-            # ADB 已连接并且设备已授权
-            return 0
-        else
-            # ADB 设备未连接或未授权
-            return 1
-        fi
+    # 获取 adb devices 输出,跳过第一行（标题行）,并检查每一行的状态
+    local connected_devices=$(adb devices | awk 'NR>1 {print $2}' | grep 'device$')
+    # 检查是否有设备已连接并且状态为 'device',即已授权
+    if [[ -n $connected_devices ]]; then
+        # ADB 已连接并且设备已授权
+        return 0
     else
-        # 表示 adb 未安装
+        # ADB 设备未连接或未授权
         return 1
     fi
 }
 
-# 安装adb工具
-install_adb() {
-    echo -e "${BLUE}绝大多数软路由自带ADB 只有少数OpenWrt硬路由才需要安装ADB${NC}"
-    # 调用函数并根据返回值判断
-    if check_adb_installed; then
-        echo -e "${YELLOW}您的路由器已经安装了ADB工具${NC}"
-    else
-        opkg update
-        echo -e "${YELLOW}正在尝试安装adb${NC}"
-        if opkg install adb; then
-            echo -e "${GREEN}adb 安装成功!${NC}"
-        else
-            echo -e "${RED}adb 安装失败,请检查日志以获取更多信息。${NC}"
-        fi
-    fi
-}
-
 # 连接adb
 connect_adb() {
-    install_adb
 
     # 尝试自动获取网关地址
     #gateway_ip=$(ip route show default | grep default | awk '{print $3}')
@@ -128,15 +85,10 @@ show_timezone() {
 
 #断开adb连接
 disconnect_adb() {
-    if check_adb_installed; then
-        adb disconnect
-        echo "ADB 已经断开"
-    else
-        echo -e "${YELLOW}您还没有安装ADB${NC}"
-    fi
+    adb disconnect
+    echo "ADB 已经断开"
 }
 
-
 get_status() {
     if check_adb_connected; then
         adb_status="${GREEN}已连接且已授权${NC}"
@@ -190,26 +142,15 @@ check_github_connected() {
     fi
 }
 
-##获取软路由型号信息
-get_router_name() {
-    if is_x86_64_router; then
-        model_name=$(grep "model name" /proc/cpuinfo | head -n 1 | awk -F: '{print $2}' | sed 's/^[ \t]*//;s/[ \t]*$//')
-        echo "$model_name"
-    else
-        model_info=$(cat /tmp/sysinfo/model)
-        echo "$model_info"
-    fi
-}
-
 # 安装Netflix
-install_netflix(){
+install_netflix() {
     local app_name_dir="netflix"
     download_apk "https://github.com/wukongdaily/tvhelper/raw/master/sony/netflix/netflix.apk" $app_name_dir
     install_app_bundle $app_name_dir
 }
 
 # 安装Disney+
-install_disney(){
+install_disney() {
     local app_name_dir="disney"
     download_apk "https://github.com/wukongdaily/tvhelper/raw/master/sony/disney/disney.apk" $app_name_dir
     download_apk "https://github.com/wukongdaily/tvhelper/raw/master/sony/disney/split_config.xhdpi.apk" $app_name_dir
@@ -218,12 +159,12 @@ install_disney(){
 }
 
 # 安装Fire TV版本Youtube
-install_youtube(){
+install_youtube() {
     install_apk "https://github.com/wukongdaily/tvhelper/raw/master/apks/youtube.apk"
 }
 
 # 安装HBO GO
-install_hbogo(){
+install_hbogo() {
     local app_name_dir="hbogo"
     download_apk "https://github.com/wukongdaily/tvhelper/raw/master/sony/hbogo/hbo-go.apk" $app_name_dir
     download_apk "https://github.com/wukongdaily/tvhelper/raw/master/sony/hbogo/split_config.xhdpi.apk" $app_name_dir
@@ -232,7 +173,7 @@ install_hbogo(){
 }
 
 # 安装appletv+
-install_appletv(){
+install_appletv() {
     local app_name_dir="appletv"
     download_apk "https://github.com/wukongdaily/tvhelper/raw/master/sony/appletv/appletv.apk" $app_name_dir
     download_apk "https://github.com/wukongdaily/tvhelper/raw/master/sony/appletv/split_config.armeabi_v7a.apk" $app_name_dir
@@ -242,7 +183,7 @@ install_appletv(){
     install_app_bundle $app_name_dir
 }
 # 安装mytvsuper
-install_mytvsuper(){
+install_mytvsuper() {
     local app_name_dir="mytvsuper"
     download_apk "https://github.com/wukongdaily/tvhelper/raw/master/sony/mytvsuper/mytvsuper.apk" $app_name_dir
     download_apk "https://github.com/wukongdaily/tvhelper/raw/master/sony/mytvsuper/split_config.xhdpi.apk" $app_name_dir
@@ -250,10 +191,9 @@ install_mytvsuper(){
     install_app_bundle $app_name_dir
 }
 
-
 # 下载单独apk
 # 保存在/tmp/应用名称的文件夹下
-download_apk(){
+download_apk() {
     local apk_download_url=$1
     local app_name_dir=$2
     local filename=$(basename "$apk_download_url")
@@ -264,7 +204,7 @@ download_apk(){
 
 # 根据文件夹名称,安装文件夹中全部apk
 install_app_bundle() {
-   local app_name_dir=$1
+    local app_name_dir=$1
     if check_adb_connected; then
         echo -e "${GREEN}正在推送和安装apk,请耐心等待...${NC}"
 
@@ -335,16 +275,15 @@ install_apk() {
     fi
 }
 
-sponsor(){
+sponsor() {
     echo
     echo -e "${GREEN}访问赞助页面和悟空百科⬇${BLUE}"
     echo -e "${BLUE} https://bit.ly/3woDZE7 ${NC}"
-    echo 
+    echo
 }
 
 # 菜单
 menu_options=(
-    "安装ADB"
     "连接ADB"
     "断开ADB"
     "安装Netflix最新版"
@@ -357,7 +296,6 @@ menu_options=(
 )
 
 commands=(
-    ["安装ADB"]="install_adb"
     ["连接ADB"]="connect_adb"
     ["断开ADB"]="disconnect_adb"
     ["安装Netflix最新版"]="install_netflix"
@@ -369,7 +307,6 @@ commands=(
     ["赞助|打赏"]="sponsor"
 )
 
-
 # 处理菜单
 handle_choice() {
     local choice=$1
@@ -410,12 +347,11 @@ show_menu() {
     mkdir -p /tmp/upload
     clear
     echo "***********************************************************************"
-    echo -e "*      ${YELLOW}Sony电视专用助手  (${current_date})${NC}        "
-    echo -e "*      ${RED}请确保电视盒子和OpenWrt路由器处于${NC}${BLUE}同一网段${NC}\n*      ${RED}且电视盒子开启了${NC}${BLUE}USB调试模式(adb开关)${NC}         "
+    echo -e "*      ${YELLOW}Sony电视专用助手Docker版  (${current_date})${NC}        "
+    echo -e "*      ${RED}请确保电视盒子和Docker宿主机处于${NC}${BLUE}同一网段${NC}\n*      ${RED}且电视盒子开启了${NC}${BLUE}USB调试模式(adb开关)${NC}         "
     echo "*      Developed by @wukongdaily        "
     echo "**********************************************************************"
     echo
-    echo "*      当前的路由器型号: $(get_router_name)"
     echo "$(check_github_connected)"
     echo "$(get_status)"
     echo "$(get_tvbox_model_name)"

shells/tv.sh

@@ -1,16 +1,6 @@
 #!/bin/bash
 # wget -O tv.sh https://raw.githubusercontent.com/wukongdaily/tvhelper-docker/master/shells/tv.sh && chmod +x tv.sh && ./tv.sh
 
-#判断是否为x86软路由
-is_x86_64_router() {
-    DISTRIB_ARCH=$(cat /etc/openwrt_release | grep "DISTRIB_ARCH" | cut -d "'" -f 2)
-    if [ "$DISTRIB_ARCH" = "x86_64" ]; then
-        return 0
-    else
-        return 1
-    fi
-}
-
 #********************************************************
 
 # 定义红色文本
@@ -462,26 +452,6 @@ get_apk_url_by_name_prefix() {
     echo "$apk_download_url"
 }
 
-# 添加emotn域名
-add_emotn_domain() {
-    # 检查 passwall 的代理域名文件是否存在
-    if [ -f "/usr/share/passwall/rules/proxy_host" ]; then
-        sed -i "s/keeflys.com//g" "/usr/share/passwall/rules/proxy_host"
-        echo -n "keeflys.com" | tee -a /usr/share/passwall/rules/proxy_host
-        echo -e "${GREEN}在pw代理域名中 添加成功!${NC}"
-    else
-        echo -e "${RED}在passwall代理域名中 添加失败! 请确保 passwall 已安装${NC}"
-    fi
-    # 检查 SSRP 的黑名单文件是否存在
-    if [ -f "/etc/ssrplus/black.list" ]; then
-        sed -i "s/keeflys.com//g" "/etc/ssrplus/black.list"
-        echo -n "keeflys.com" | tee -a /etc/ssrplus/black.list
-        echo -e "${GREEN}在SSRP代理域名中 添加成功!${NC}"
-    else
-        echo -e "${RED}添加失败! 请确保 SSRP 已安装${NC}"
-    fi
-    echo -e "\n\n"
-}
 
 get_status() {
     if check_adb_connected; then
@@ -583,7 +553,7 @@ install_mixapps() {
 }
 # 进入KODI助手
 kodi_helper() {
-    wget -O kodi.sh https://raw.githubusercontent.com/wukongdaily/tvhelper/master/shells/kodi.sh && chmod +x kodi.sh && ./kodi.sh
+    wget -O kodi.sh https://raw.githubusercontent.com/wukongdaily/tvhelper-docker/master/shells/kodi.sh && chmod +x kodi.sh && ./kodi.sh
 }
 
 # 安装fire tv版本youtube
@@ -594,12 +564,12 @@ install_youtube_firetv() {
 
 # 进入tvbox安装助手
 enter_tvbox_helper() {
-    wget -O box.sh https://raw.githubusercontent.com/wukongdaily/tvhelper/master/shells/box.sh && chmod +x box.sh && ./box.sh
+    wget -O box.sh https://raw.githubusercontent.com/wukongdaily/tvhelper-docker/master/shells/box.sh && chmod +x box.sh && ./box.sh
 }
 
 # 进入sony电视助手
 enter_sonytv() {
-    wget -O sony.sh https://raw.githubusercontent.com/wukongdaily/tvhelper/master/shells/sony.sh && chmod +x sony.sh && ./sony.sh
+    wget -O sony.sh https://raw.githubusercontent.com/wukongdaily/tvhelper-docker/master/shells/sony.sh && chmod +x sony.sh && ./sony.sh
 }
 
 # 赞助
@@ -613,7 +583,6 @@ sponsor() {
 menu_options=(
     "连接ADB"
     "断开ADB"
-    "给软路由添加主机名映射(自定义挟持域名,仅限主路由模式)"
     "一键修改电视盒子NTP服务器地址(需重启)"
     "向TV端输入文字(限英文)"
     "为Google TV系统安装Play商店图标"
@@ -621,7 +590,6 @@ menu_options=(
     "模拟菜单键"
     "安装电视订阅助手"
     "安装Emotn Store应用商店"
-    "给软路由增加Emotn Store域名"
     "安装当贝市场"
     "安装文件管理器+"
     "安装Downloader"
@@ -643,13 +611,11 @@ commands=(
     ["一键修改电视盒子NTP服务器地址(需重启)"]="modify_ntp"
     ["安装电视订阅助手"]="install_subhelper_apk"
     ["安装Emotn Store应用商店"]="install_emotn_store"
-    ["给软路由增加Emotn Store域名"]="add_emotn_domain"
     ["安装当贝市场"]="install_dbmarket"
     ["向TV端输入文字(限英文)"]="input_text"
     ["显示Netflix影片码率"]="show_nf_info"
     ["模拟菜单键"]="show_menu_keycode"
     ["为Google TV系统安装Play商店图标"]="show_playstore_icon"
-    ["给软路由添加主机名映射(自定义挟持域名,仅限主路由模式)"]="add_dhcp_domain"
     ["安装my-tv最新版(lizongying)"]="install_mytv_latest_apk"
     ["安装BBLL最新版(xiaye13579)"]="install_BBLL_latest_apk"
     ["安装文件管理器+"]="install_file_manager_plus"
@@ -721,7 +687,7 @@ show_menu() {
     mkdir -p /tmp/upload
     clear
     echo "***********************************************************************"
-    echo -e "*      ${YELLOW}遥控助手OpenWrt版 (${current_date})${NC}        "
+    echo -e "*      ${YELLOW}遥控助手/盒子助手Docker版 (${current_date})${NC}        "
     echo -e "*      ${GREEN}专治安卓原生TV盒子在大陆使用的各种水土不服${NC}         "
     echo -e "*      ${RED}请确保电视盒子和Docker宿主机处于${NC}${BLUE}同一网段${NC}\n*      ${RED}且电视盒子开启了${NC}${BLUE}USB调试模式(adb开关)${NC}         "
     echo "*      Developed by @wukongdaily        "