update to master

This commit is contained in:
YouROK
2021-06-08 14:12:32 +03:00
parent 009b51f578
commit 533ab85f9f
89 changed files with 46034 additions and 8804 deletions

View File

@@ -34,6 +34,7 @@ OUTPUT="${ROOT}/dist/TorrServer"
#### Build web
echo "Build web"
cd "${ROOT}/web" || exit 1
npm install --silent
npm run --silent build-js
cp "${ROOT}/web/dest/index.html" "${ROOT}/server/web/pages/template/pages/"
@@ -55,6 +56,7 @@ for PLATFORM in "${PLATFORMS[@]}"; do
set_goarm "$GOARCH"
BIN_FILENAME="${OUTPUT}-${GOOS}-${GOARCH}${GOARM}"
if [[ "${GOOS}" == "windows" ]]; then BIN_FILENAME="${BIN_FILENAME}.exe"; fi
# CMD="GOOS=${GOOS} GOARCH=${GOARCH} ${GO_ARM} CGO_ENABLED=0 ${GOBIN} build ${BUILD_FLAGS} -o ${BIN_FILENAME} ./cmd"
CMD="GOOS=${GOOS} GOARCH=${GOARCH} ${GO_ARM} ${GOBIN} build ${BUILD_FLAGS} -o ${BIN_FILENAME} ./cmd"
echo "${CMD}"
eval "$CMD" || FAILURES="${FAILURES} ${GOOS}/${GOARCH}${GOARM}"