diff --git a/ansible/www-standalone/tools/promote/_promote.sh b/ansible/www-standalone/tools/promote/_promote.sh index 3001a0cf6..b374e2770 100755 --- a/ansible/www-standalone/tools/promote/_promote.sh +++ b/ansible/www-standalone/tools/promote/_promote.sh @@ -50,7 +50,7 @@ for subdir in $(cd $srcdir && ls); do done if [ "X${version}" == "X" ] && [ "$resha" == "yes" ]; then - ${__dirname}/_resha.sh $site $dstdir $subdir + ${__dirname}/_resha.sh $site $srcdir $dstdir $subdir . ${__dirname}/upload_to_cloudflare.sh $site $subdir fi diff --git a/ansible/www-standalone/tools/promote/_resha.sh b/ansible/www-standalone/tools/promote/_resha.sh index 54ffbdff2..00d4ef8ee 100755 --- a/ansible/www-standalone/tools/promote/_resha.sh +++ b/ansible/www-standalone/tools/promote/_resha.sh @@ -3,8 +3,9 @@ set -e site=$1 -dstdir=$2 -version=$3 +srcdir=$2 +dstdir=$3 +version=$4 __dirname="$(CDPATH= cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" . ${__dirname}/settings @@ -14,6 +15,11 @@ if [ "X${site}" == "X" ]; then exit 1 fi +if [ "X${srcdir}" == "X" ]; then + echo "srcdir argument not provided" + exit 1 +fi + if [ "X${dstdir}" == "X" ]; then echo "dstdir argument not provided" exit 1 diff --git a/ansible/www-standalone/tools/promote/resha_release.sh b/ansible/www-standalone/tools/promote/resha_release.sh index 97325fe43..261533b4e 100755 --- a/ansible/www-standalone/tools/promote/resha_release.sh +++ b/ansible/www-standalone/tools/promote/resha_release.sh @@ -16,6 +16,7 @@ fi . ${__dirname}/settings +srcdir=$release_srcdir dstdir=$release_dstdir if [ "X${1}" == "X" ]; then @@ -23,7 +24,7 @@ if [ "X${1}" == "X" ]; then exit 1 fi -${__dirname}/_resha.sh $site $dstdir $2 +${__dirname}/_resha.sh $site $srcdir $dstdir $2 # https://github.com/nodejs/build/issues/3508 # Output from upload_to_cloudflare.sh must not go to stdout to prevent