diff --git a/spec_on_pages.sh b/spec_on_pages.sh index aed5544319335d5422d9f629e9722660c3323e70..8da6d713705bf96796e6eac5057eaf57d5e0712b 100644 --- a/spec_on_pages.sh +++ b/spec_on_pages.sh @@ -118,35 +118,41 @@ if [ ${11} == "false" ]; then ##Handling versions: update latestRelease and latest (majorVersion updated) if [[ "${latest}" > "${latestRelease}" || "${latest}" == "${latestRelease}" ]]; then - if [[ ${latestVersionDeployed_inter} < ${interVersion} || ${latestVersionDeployed_inter} == ${interVersion} ]]; then + if [[ ${latestVersionDeployed_inter} == ${interVersion} ]]; then if [[ ${latestVersionDeployed_minor} < ${minorVersion} || ${latestVersionDeployed_minor} == ${minorVersion} ]]; then echo "Upgrade latest release...deploying version ${10} as latest and ${latest}" mike deploy --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH -u ${10} ${latest} latest + echo "Hidding version ${latestVersionDeployed}..." + mike props --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH --set hidden=true "${latestVersionDeployed}" else echo "Deploying version ${10}" mike deploy --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH -u ${10} - if [[ ${latestVersionDeployed_inter} == ${interVersion} ]]; then - echo "Hidding version ${10}..." - mike props --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH --set hidden=true "${10}" - fi + echo "Hidding version ${10}..." + mike props --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH --set hidden=true "${10}" fi + elif [[ ${latestVersionDeployed_inter} < ${interVersion} ]]; then + echo "Upgrade latest release...deploying version ${10} as latest and ${latest}" + mike deploy --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH -u ${10} ${latest} latest else echo "Deploying version ${10}" mike deploy --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH -u ${10} fi else - if [[ ${latestVersionDeployed_inter} < ${interVersion} || ${latestVersionDeployed_inter} == ${interVersion} ]]; then + if [[ ${latestVersionDeployed_inter} == ${interVersion} ]]; then if [[ ${latestVersionDeployed_minor} < ${minorVersion} || ${latestVersionDeployed_minor} == ${minorVersion} ]]; then echo "Deploying version ${10} as ${latest}" mike deploy --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH -u ${10} ${latest} + echo "Hidding version ${latestVersionDeployed}..." + mike props --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH --set hidden=true "${latestVersionDeployed}" else echo "Deploying version ${10}" mike deploy --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH -u ${10} - if [[ ${latestVersionDeployed_inter} == ${interVersion} ]]; then - echo "Hidding version ${10}..." - mike props --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH --set hidden=true "${10}" - fi + echo "Hidding version ${10}..." + mike props --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH --set hidden=true "${10}" fi + elif [[ ${latestVersionDeployed_inter} < ${interVersion} ]]; then + echo "Deploying version ${10} as ${latest}" + mike deploy --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH -u ${10} ${latest} else echo "Deploying version ${10}" mike deploy --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH -u ${10} @@ -154,12 +160,12 @@ if [ ${11} == "false" ]; then fi ##Handling versions: hide version with editorial changes (minorVersion updated) - if [[ ${latestVersionDeployed_inter} == ${interVersion} ]]; then - if [[ ${latestVersionDeployed_minor} < ${minorVersion} ]]; then - echo "Hidding version ${latestVersionDeployed}..." - mike props --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH --set hidden=true "${latestVersionDeployed}" - fi - fi + #if [[ ${latestVersionDeployed_inter} == ${interVersion} ]]; then + # if [[ ${latestVersionDeployed_minor} < ${minorVersion} ]]; then + # echo "Hidding version ${latestVersionDeployed}..." + # mike props --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH --set hidden=true "${latestVersionDeployed}" + # fi + #fi fi fi else