'Generic Commit'

getpkg/publish.sh

@@ -6,6 +6,7 @@ ARCH=$(uname -m)
 TEMP_DIR="${SCRIPT_DIR}/temp"
 SOS="${TEMP_DIR}/sos"
 PROJECT="getpkg"
+OUTPUT="${SCRIPT_DIR}/output"
 
 echo "Publishing ${PROJECT} to gitea.jde.nz/public/${PROJECT}:latest"
 
@@ -17,8 +18,8 @@ function die() {
 [[ -n $SOS_WRITE_TOKEN ]] || die "SOS_WRITE_TOKEN not specified"
 
 # clear output dir
-rm -rf "${SCRIPT_DIR}/output" 
-mkdir -p "${SCRIPT_DIR}/output"
+rm -rf "${OUTPUT}" 
+mkdir -p "${OUTPUT}"
 
 # build release version
 export CMAKE_BUILD_TYPE="Release"
@@ -28,10 +29,10 @@ docker build \
   -f "${SCRIPT_DIR}/Dockerfile.dropshell-build" \
   --build-arg PROJECT="${PROJECT}" \
   --build-arg CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" \
-  --output "${SCRIPT_DIR}/output" \
+  --output "${OUTPUT}" \
   "${SCRIPT_DIR}"
 
-[ -f ${SCRIPT_DIR}/output/${PROJECT} ] || die "Build failed."
+[ -f ${OUTPUT}/${PROJECT} ] || die "Build failed."
 
 # download the sos binary
 mkdir -p "${TEMP_DIR}"
@@ -40,7 +41,12 @@ curl -L -o "${SOS}" "https://getbin.xyz/sos"
 chmod +x "${SOS}"
 
 # upload arch-specific binary
-"${SOS}" upload "getbin.xyz" "${SCRIPT_DIR}/output/${PROJECT}" "${PROJECT}:latest-${ARCH}"
+"${SOS}" upload "getbin.xyz" "${OUTPUT}/${PROJECT}" "${PROJECT}:latest-${ARCH}"
 
 # upload generic install script (ok if multiple times as we iterate through arch's)
 "${SOS}" upload "getbin.xyz" "${SCRIPT_DIR}/install.sh" "${PROJECT}-install:latest"
+
+TOOLDIR="${OUTPUT}/tool"
+mkdir "${TOOLDIR}"
+cp "${OUTPUT}/${PROJECT}" "${TOOLDIR}/${PROJECT}"
+"${OUTPUT}/${PROJECT}" publish "getpkg:${ARCH}" "${TOOLDIR}"