Skip to content

Commit c5ad990

Browse files
authored
ansible: pass srcdir to _resha script (#3954)
It needs it after #3953
1 parent 802b59d commit c5ad990

3 files changed

Lines changed: 11 additions & 4 deletions

File tree

ansible/www-standalone/tools/promote/_promote.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ for subdir in $(cd $srcdir && ls); do
5050
done
5151

5252
if [ "X${version}" == "X" ] && [ "$resha" == "yes" ]; then
53-
${__dirname}/_resha.sh $site $dstdir $subdir
53+
${__dirname}/_resha.sh $site $srcdir $dstdir $subdir
5454
. ${__dirname}/upload_to_cloudflare.sh $site $subdir
5555
fi
5656

ansible/www-standalone/tools/promote/_resha.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
set -e
44

55
site=$1
6-
dstdir=$2
7-
version=$3
6+
srcdir=$2
7+
dstdir=$3
8+
version=$4
89

910
__dirname="$(CDPATH= cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
1011
. ${__dirname}/settings
@@ -14,6 +15,11 @@ if [ "X${site}" == "X" ]; then
1415
exit 1
1516
fi
1617

18+
if [ "X${srcdir}" == "X" ]; then
19+
echo "srcdir argument not provided"
20+
exit 1
21+
fi
22+
1723
if [ "X${dstdir}" == "X" ]; then
1824
echo "dstdir argument not provided"
1925
exit 1

ansible/www-standalone/tools/promote/resha_release.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ fi
1616

1717
. ${__dirname}/settings
1818

19+
srcdir=$release_srcdir
1920
dstdir=$release_dstdir
2021

2122
if [ "X${1}" == "X" ]; then
2223
echo "Please provide a version string"
2324
exit 1
2425
fi
2526

26-
${__dirname}/_resha.sh $site $dstdir $2
27+
${__dirname}/_resha.sh $site $srcdir $dstdir $2
2728

2829
# https://github.com/nodejs/build/issues/3508
2930
# Output from upload_to_cloudflare.sh must not go to stdout to prevent

0 commit comments

Comments
 (0)