From 233a9957c3c8d0d51f0f5a3d806757ec768d9741 Mon Sep 17 00:00:00 2001 From: zhangsz Date: Fri, 21 Feb 2025 20:21:00 +0800 Subject: [PATCH] fix: build and cp --- bin/build.sh | 4 +++- bin/cpto205.sh | 35 ++++++++++++++++++++++++++++++----- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index c4516da..97adf1c 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -180,7 +180,9 @@ create-src-tar(){ --exclude=${BuildRelativeDir}/build/docker/wfc/modules/*/jar/*.jar \ --exclude=${BuildRelativeDir}/build/docker/wfc/visual/jar/*.jar \ --exclude=${BuildRelativeDir}/bin/cpto205.sh \ - ${WFCRelativeDir} 1>/dev/null + --exclude=${BuildRelativeDir}/docs/99-reference \ + --exclude=${BuildRelativeDir}/docs/100-images \ + ${WFCRelativeDir} 1>/dev/null echo "done" } diff --git a/bin/cpto205.sh b/bin/cpto205.sh index 981ff36..157b104 100755 --- a/bin/cpto205.sh +++ b/bin/cpto205.sh @@ -1,6 +1,6 @@ #!/bin/bash -git_root_dir=$(dirname $(realpath $0)/../../..) +git_root_dir=$(dirname $(dirname $(dirname $(realpath $0)))) build_root_dir=${git_root_dir}/build.wfc build_doc_dir=${build_root_dir}/docs/03-configuration local_tars_rel_dir=${build_root_dir}/release/tars @@ -13,7 +13,7 @@ rel_date=$(date +%Y%m%d) passwd=admin123 usage() { - echo "Usage: sh cpto205.sh {rel_date} (format: YYYYMMDD)" + echo "Usage: sh cpto205.sh {rel_date}" exit 1 } @@ -25,16 +25,41 @@ quickstart_file=${build_doc_dir}/03-wfc-quickstart.pdf latest_tar_file=$(ls -t ${local_tars_rel_dir}/*${rel_date}* 2>/dev/null | head -n 1) latest_deb_file=$(ls -t ${local_debs_rel_dir}/*${rel_date}* 2>/dev/null | head -n 1) -# Use expect to automatically answer yes and input password +# Use expect to automatically answer yes and input password for SCP commands expect <