From 8e2c42402be0f5f68249106cf91bffd46bbcb6dd Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Thu, 18 Jun 2020 16:13:39 -0500
Subject: [PATCH] Support testing

---
 create_dist.cmd | 23 ++++++++++++++---------
 create_dist.sh  | 12 ++++++++++--
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/create_dist.cmd b/create_dist.cmd
index ba1ec57..5b71f03 100644
--- a/create_dist.cmd
+++ b/create_dist.cmd
@@ -1,10 +1,15 @@
-@echo off       
+@echo off
 setlocal EnableDelayedExpansion
 
 set ROOT=%~dp0%
 set /a ENABLE_UPLOAD=%1
 set BITBUCKET_AUTH=%2
-
+set BITBUCKET_TESTING=%3
+if "%BITBUCKET_TESTING%" == "1" (
+  set REPOSITORY=repertory-testing
+) else (
+  set REPOSITORY=repertory-ui
+)
 set OPENSSL_BIN="c:\OpenSSL-Win64\bin\openssl.exe"
 if NOT EXIST %OPENSSL_BIN% (
   set OPENSSL_BIN="c:\Program Files\OpenSSL-Win64\bin\openssl.exe"
@@ -50,7 +55,7 @@ pushd "%ROOT%"
         call :UPLOAD_TO_BITBUCKET "%OUT_FILE%"
         call :UPLOAD_TO_BITBUCKET "%OUT_FILE%.sha256"
         call :UPLOAD_TO_BITBUCKET "%OUT_FILE%.sig"
-        set BITBUCKET_LOCATION=https://bitbucket.org/blockstorage/repertory-ui/downloads/%OUT_FILE%
+        set BITBUCKET_LOCATION=https://bitbucket.org/blockstorage/%REPOSITORY%/downloads/%OUT_FILE%
 
         del /q releases.json 1>NUL 2>&1
 
@@ -65,10 +70,10 @@ pushd "%ROOT%"
   )
 popd
 goto :END
-        
+
 :NO_QUOTES
   set %~1=!%~1:"=!
-goto :EOF 
+goto :EOF
 
 :PIXEL_RESPONSE
   set PIXEL_RESPONSE=
@@ -98,8 +103,8 @@ goto :EOF
   set SOURCE_FILE=%1
   call :NO_QUOTES SOURCE_FILE
   call :NO_QUOTES BITBUCKET_AUTH
-  echo "Uploading !SOURCE_FILE! to Bitbucket"
-  (curl --fail -u "!BITBUCKET_AUTH!" -X POST https://api.bitbucket.org/2.0/repositories/blockstorage/repertory-ui/downloads -F files="@!SOURCE_FILE!" > upload_response.json) || (call :ERROR "Upload to Bitbucket failed: %SOURCE_FILE%")
+  echo "Uploading !SOURCE_FILE! to Bitbucket %REPOSITORY%"
+  (curl --fail -u "!BITBUCKET_AUTH!" -X POST https://api.bitbucket.org/2.0/repositories/blockstorage/%REPOSITORY%/downloads -F files="@!SOURCE_FILE!" > upload_response.json) || (call :ERROR "Upload to Bitbucket %REPOSITORY% failed: %SOURCE_FILE%")
 goto :EOF
 
 :ERROR
@@ -108,9 +113,9 @@ goto :EOF
   if "%DISABLE_PAUSE%" NEQ "1" (
     pause
   )
-goto :END 
+goto :END
 
 :END
   if "!ERROR_EXIT!" NEQ "0" (
     exit !ERROR_EXIT!
-  )
\ No newline at end of file
+  )
diff --git a/create_dist.sh b/create_dist.sh
index c8b6ba8..2bf2255 100755
--- a/create_dist.sh
+++ b/create_dist.sh
@@ -7,6 +7,13 @@ export PATH
 
 ENABLE_UPLOAD=$1
 BITBUCKET_AUTH=$2
+BITBUCKET_TESTING=$3
+
+if [ "$BITBUCKET_TESTING" = "1" ]; then
+  REPOSITORY=repertory-testing
+else
+  REPOSITORY=repertory-ui
+fi
 
 PRIVATE_KEY=../../blockstorage_dev_private.pem
 PUBLIC_KEY=../blockstorage_dev_public.pem
@@ -33,7 +40,8 @@ exit_script() {
 
 upload_to_bitbucket() {
   SOURCE_FILE=$1
-  curl --fail -u "${BITBUCKET_AUTH}" -X POST https://api.bitbucket.org/2.0/repositories/blockstorage/repertory-ui/downloads -F files=@${SOURCE_FILE} > upload_response.json || exit_script "Upload to Bitbucket failed: ${SOURCE_FILE}"
+  echo "Uploading ${SOURCE_FILE} to Bitbucket ${REPOSITORY}"
+  curl --fail -u "${BITBUCKET_AUTH}" -X POST https://api.bitbucket.org/2.0/repositories/blockstorage/${REPOSITORY}/downloads -F files=@${SOURCE_FILE} > upload_response.json || exit_script "Upload to Bitbucket failed: ${SOURCE_FILE}"
 }
 
 chmod +x "bin/${JQ_EXEC}" || exit_script "chmod +x ${JQ_EXEC} failed"
@@ -65,7 +73,7 @@ if npm run dist; then
         upload_to_bitbucket "${OUT_FILE}"
         upload_to_bitbucket "${OUT_FILE}.sha256"
         upload_to_bitbucket "${OUT_FILE}.sig"
-        BITBUCKET_LOCATION=https://bitbucket.org/blockstorage/repertory-ui/downloads/${OUT_FILE}
+        BITBUCKET_LOCATION=https://bitbucket.org/blockstorage/${REPOSITORY}/downloads/${OUT_FILE}
 
         cp -f ../releases.json ./releases.json
         for DISTRONAME in ${DISTRO_LIST}; do