diff --git a/v2raya/v2raya.sh b/v2raya/v2raya.sh index ab5a0aa..456ad91 100644 --- a/v2raya/v2raya.sh +++ b/v2raya/v2raya.sh @@ -12,7 +12,7 @@ CYAN='\033[0;36m' NC='\033[0m' # No Color # 配置变量 -INSTALL_DIR="/root/data/docker_data" +INSTALL_DIR="/root/data/docker_data/v2raya" BASE_URL="https://gitea.tohub.top/Share/vps/raw/branch/main/v2raya" XRAY_VERSION="25.8.3" V2RAYA_VERSION="2.2.7.4" @@ -310,25 +310,18 @@ uninstall_v2raya() { apt purge xray v2raya -y 2>/dev/null fi - # 询问是否删除安装包 + # 询问是否删除安装包目录 echo "" - read -p "是否删除下载的安装包?[y/N] " -n 1 -r + read -p "是否删除安装包目录?[y/N] " -n 1 -r echo if [[ $REPLY =~ ^[Yy]$ ]]; then - print_info "删除安装包..." - if [[ -f "$xray_file" ]]; then - rm -f "$xray_file" - print_success "已删除: $xray_file" - fi - if [[ -f "$v2raya_file" ]]; then - rm -f "$v2raya_file" - print_success "已删除: $v2raya_file" - fi - # 如果安装目录为空,则删除目录 - if [[ -d "$INSTALL_DIR" ]] && [[ -z "$(ls -A $INSTALL_DIR)" ]]; then - rmdir "$INSTALL_DIR" - print_success "已删除空目录: $INSTALL_DIR" + print_info "删除安装包目录: $INSTALL_DIR" + if [[ -d "$INSTALL_DIR" ]]; then + rm -rf "$INSTALL_DIR" + print_success "已删除: $INSTALL_DIR" + else + print_warning "目录不存在: $INSTALL_DIR" fi fi @@ -344,29 +337,19 @@ uninstall_v2raya() { # 清理下载的安装包 clean_packages() { - local arch=$(detect_arch) - local v2raya_arch=$(get_v2raya_arch "$arch") - local xray_file="$INSTALL_DIR/xray_${XRAY_VERSION}_${arch}.deb" - local v2raya_file="$INSTALL_DIR/v2raya_${v2raya_arch}_${V2RAYA_VERSION}.deb" - local files_found=0 + print_warning "即将删除安装包目录: $INSTALL_DIR" - print_warning "即将删除下载的安装包" - - # 检查文件是否存在 - if [[ -f "$xray_file" ]]; then - echo " - $xray_file" - files_found=1 - fi - if [[ -f "$v2raya_file" ]]; then - echo " - $v2raya_file" - files_found=1 - fi - - if [[ $files_found -eq 0 ]]; then - print_info "没有找到需要清理的安装包" + # 检查目录是否存在 + if [[ ! -d "$INSTALL_DIR" ]]; then + print_info "安装包目录不存在,无需清理" return fi + # 显示目录内容 + echo "" + print_info "目录内容:" + ls -lh "$INSTALL_DIR" 2>/dev/null | tail -n +2 | awk '{print " - " $9 " (" $5 ")"}' + echo "" read -p "是否继续删除?[y/N] " -n 1 -r echo @@ -376,23 +359,14 @@ clean_packages() { return fi - # 删除文件 - if [[ -f "$xray_file" ]]; then - rm -f "$xray_file" - print_success "已删除: $xray_file" + # 删除整个目录 + rm -rf "$INSTALL_DIR" + if [[ $? -eq 0 ]]; then + print_success "已删除: $INSTALL_DIR" + print_success "清理完成" + else + print_error "删除失败: $INSTALL_DIR" fi - if [[ -f "$v2raya_file" ]]; then - rm -f "$v2raya_file" - print_success "已删除: $v2raya_file" - fi - - # 如果安装目录为空,则删除目录 - if [[ -d "$INSTALL_DIR" ]] && [[ -z "$(ls -A $INSTALL_DIR)" ]]; then - rmdir "$INSTALL_DIR" - print_success "已删除空目录: $INSTALL_DIR" - fi - - print_success "清理完成" } # 检查安装状态