diff --git a/main.sh b/main.sh index edfbe68..81cad43 100644 --- a/main.sh +++ b/main.sh @@ -39,7 +39,7 @@ is_valid_ip() { # 显示指定目录下的文件或目录 show_file(){ filer=$1 - find /data/update/"$filer" -maxdepth 1 \( -type f -o -type d \) -printf "%T@\t%-20f\n" | sort -n | awk '{print $2"\t"strftime("%Y-%m-%d %H:%M:%S", $1)}' + find /data/update/"$filer" -maxdepth 1 \( -type f -o -type d \) -printf "%T@\t%-40f\n" | sort -n | awk '{print $2"\t"strftime("%Y-%m-%d %H:%M:%S", $1)}' } # 发包并解压缩 @@ -252,6 +252,7 @@ gm_option() { echo -e "${yellow}$action_desc${NC}" if [ "$action" = "package" ]; then show_file project + echo -e "${blue}==============================${NC}" read -rp "请输入表所在游戏项目地址: " project bash "$script" "$project" echo -e "gm打包完成" diff --git a/update_gm.sh b/update_gm.sh index 65db805..427ca05 100644 --- a/update_gm.sh +++ b/update_gm.sh @@ -12,6 +12,10 @@ BASE_DIR="/data/update/project/miduo_gm" #表文件地址,不同渠道用表不一样 table=$1 TABLE_DIR="/data/update/project/${table}" +if [ -z ${table} ]; then + TABLE_DIR=BASE_DIR + echo -e "默认使用gm打表路径" +fi #excel cd ${TABLE_DIR}/data_excel/ || exit