From 60d2327b7e7c9118f14efa11b44ba7b3efa33536 Mon Sep 17 00:00:00 2001 From: Oleg Sheynin Date: Thu, 6 Jun 2024 20:07:49 -0400 Subject: [PATCH] progress --- release_version.txt | 2 +- scripts/build_release.sh | 10 +++++++--- scripts/set_version.sh | 24 +++++++++++++----------- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/release_version.txt b/release_version.txt index 879be8a..e7c7d3c 100644 --- a/release_version.txt +++ b/release_version.txt @@ -1 +1 @@ -0.7.7 +0.7.8 diff --git a/scripts/build_release.sh b/scripts/build_release.sh index a9487b2..6159005 100755 --- a/scripts/build_release.sh +++ b/scripts/build_release.sh @@ -64,6 +64,13 @@ else fi tmp_dir=$(mktemp -d) +function cleanup { + cd ${HOME} + rm -rf ${tmp_dir} +} +trap cleanup EXIT + + prj_dir="${tmp_dir}/${prj}" cmd_arr=() @@ -150,7 +157,4 @@ do pwd && echo ${cmd} && eval ${cmd} done -cd ${HOME} -rm -rf ${tmp_dir} - echo "$0 Done ${project} ${release_version}" diff --git a/scripts/set_version.sh b/scripts/set_version.sh index e4012c2..2f72940 100755 --- a/scripts/set_version.sh +++ b/scripts/set_version.sh @@ -1,5 +1,17 @@ #!/bin/bash + +# ----- Settings +LocalSoftwareDir=${HOME}/software/cvtt2 + +ProdDir=${HOME}/prod + +ReleaseHosts=("cloud21.cvtt.vpn") +ReleasePorts=("22") +ReleaseUsers=("cvttdist") +ReleaseDir=("/home/cvttdist/software/cvtt2") +# ----- Settings + function usage() { echo "Usage: ${0} " exit 1 @@ -18,17 +30,6 @@ then Version=latest fi -# ----- Settings -LocalSoftwareDir=${HOME}/software/cvtt2 - -ProdDir=${HOME}/prod - -ReleaseHosts=("cloud21.cvtt.vpn") -ReleasePorts=("22") -ReleaseUsers=("cvttdist") -ReleaseDir=("/home/cvttdist/software/cvtt2") -# ----- Settings - function rsync_load_version() { for idx in "${!ReleaseHosts[@]}" do @@ -68,6 +69,7 @@ function rsync_load_version() { } mkdir -p ${LocalSoftwareDir} +mkdir -p ${ProdDir} # exists and not empty rsync_load_version