Consistify handling of NAME env var.

Author: yhahn

build_source.sh

@@ -14,16 +14,15 @@ set -e -u
 
 CWD=$(pwd)
 BUILD_DIR=/tmp/v${NODE_VERSION}
-NAMEPATH=""
 
 if [ -n "$NAME" ]; then
-    NAMEPATH="/$NAME"
+    S3_URL="$S3_URL/$NAME"
 fi
 
 git clone https://github.com/mapbox/node.git -b ${BRANCH} $BUILD_DIR
 cd $BUILD_DIR
 ./configure --prefix=$BUILD_DIR
 make node-v${NODE_VERSION}.tar.gz
-aws s3 cp --acl=public-read node-v${NODE_VERSION}.tar.gz ${S3_URL}${NAMEPATH}/v${NODE_VERSION}/node-v${NODE_VERSION}.tar.gz
+aws s3 cp --acl=public-read node-v${NODE_VERSION}.tar.gz ${S3_URL}/v${NODE_VERSION}/node-v${NODE_VERSION}.tar.gz
 
 cd $CWD

sign_node.sh

@@ -20,6 +20,10 @@ set -e -u
 TMP=/tmp/v${NODE_VERSION}-signing
 mkdir -p ${TMP}/x64
 
+if [ -n "$NAME" ]; then
+    S3_URL="$S3_URL/$NAME"
+fi
+
 # Download built node
 aws s3 cp ${S3_URL}/v${NODE_VERSION}/node.exe ${TMP}/
 aws s3 cp ${S3_URL}/v${NODE_VERSION}/x64/node.exe ${TMP}/x64/

update_shashums.sh

@@ -10,6 +10,10 @@ if [[ ${S3_URL:-false} == false ]]; then
     exit 1
 fi
 
+if [ -n "$NAME" ]; then
+    S3_URL="$S3_URL/$NAME"
+fi
+
 SCRATCH_DIR=/tmp/v${NODE_VERSION}-scratch
 mkdir -p ${SCRATCH_DIR}
 aws s3 cp --recursive ${S3_URL}/v${NODE_VERSION}/ ${SCRATCH_DIR}/

windows/build_node.bat

@@ -33,20 +33,20 @@ IF ERRORLEVEL 1 GOTO ERROR
 SET ARCHPATH=
 IF %BUILDPLATFORM% EQU x64 (SET ARCHPATH="x64/")
 
-SET NAMEPATH=
-IF "%NAME%" NEQ "" (SET NAMEPATH="/%NAME%")
+SET S3URL="s3://mapbox/node-cpp11"
+IF "%NAME%" NEQ "" (SET S3URL="%S3URL%/%NAME%")
 
-call aws s3 cp --acl public-read %BUILD_TYPE%\node.exe s3://mapbox/node-cpp11%NAMEPATH%/v%NODE_VERSION%/%ARCHPATH%
+call aws s3 cp --acl public-read %BUILD_TYPE%\node.exe %S3URL%/v%NODE_VERSION%/%ARCHPATH%
 ::IF ERRORLEVEL 1 GOTO ERROR
-call aws s3 cp --acl public-read %BUILD_TYPE%\node.lib s3://mapbox/node-cpp11%NAMEPATH%/v%NODE_VERSION%/%ARCHPATH%
+call aws s3 cp --acl public-read %BUILD_TYPE%\node.lib %S3URL%/v%NODE_VERSION%/%ARCHPATH%
 ::IF ERRORLEVEL 1 GOTO ERROR
-call aws s3 cp --acl public-read %BUILD_TYPE%\node.exp s3://mapbox/node-cpp11%NAMEPATH%/v%NODE_VERSION%/%ARCHPATH%
+call aws s3 cp --acl public-read %BUILD_TYPE%\node.exp %S3URL%/v%NODE_VERSION%/%ARCHPATH%
 ::IF ERRORLEVEL 1 GOTO ERROR
-call aws s3 cp --acl public-read %BUILD_TYPE%\node.pdb s3://mapbox/node-cpp11%NAMEPATH%/v%NODE_VERSION%/%ARCHPATH%
+call aws s3 cp --acl public-read %BUILD_TYPE%\node.pdb %S3URL%/v%NODE_VERSION%/%ARCHPATH%
 ::IF ERRORLEVEL 1 GOTO ERROR
-call aws s3 cp --acl public-read %BUILD_TYPE%\openssl-cli.exe s3://mapbox/node-cpp11%NAMEPATH%/v%NODE_VERSION%/%ARCHPATH%
+call aws s3 cp --acl public-read %BUILD_TYPE%\openssl-cli.exe %S3URL%/v%NODE_VERSION%/%ARCHPATH%
 ::IF ERRORLEVEL 1 GOTO ERROR
-call aws s3 cp --acl public-read %BUILD_TYPE%\openssl-cli.pdb s3://mapbox/node-cpp11%NAMEPATH%/v%NODE_VERSION%/%ARCHPATH%
+call aws s3 cp --acl public-read %BUILD_TYPE%\openssl-cli.pdb %S3URL%/v%NODE_VERSION%/%ARCHPATH%
 ::IF ERRORLEVEL 1 GOTO ERROR
 
 GOTO DONE