diff --git a/pkg/linux/build-functions.sh b/pkg/linux/build-functions.sh index b23b16f7a..2abdc27b0 100644 --- a/pkg/linux/build-functions.sh +++ b/pkg/linux/build-functions.sh @@ -5,10 +5,7 @@ _setup_env() { WD=$(cd "$(dirname "$1")" && pwd) SOURCEDIR=$(realpath "${WD}/../..") BUILDROOT=$(realpath "${WD}/../../$2-build") - DESKTOPROOT=${BUILDROOT}/desktop - METAROOT=${BUILDROOT}/meta SERVERROOT=${BUILDROOT}/server - WEBROOT=${BUILDROOT}/web DISTROOT=$(realpath "${WD}/../../dist") APP_RELEASE=$(grep "^APP_RELEASE" web/version.py | cut -d"=" -f2 | sed 's/ //g') APP_REVISION=$(grep "^APP_REVISION" web/version.py | cut -d"=" -f2 | sed 's/ //g') @@ -52,10 +49,7 @@ _cleanup() { _setup_dirs() { echo "Creating output directories..." test -d "${BUILDROOT}" || mkdir "${BUILDROOT}" - test -d "${DESKTOPROOT}" || mkdir "${DESKTOPROOT}" - test -d "${METAROOT}" || mkdir "${METAROOT}" test -d "${SERVERROOT}" || mkdir "${SERVERROOT}" - test -d "${WEBROOT}" || mkdir "${WEBROOT}" test -d "${DISTROOT}" || mkdir "${DISTROOT}" } @@ -247,10 +241,6 @@ _copy_code() { # License files cp "${SOURCEDIR}/LICENSE" "${SERVERROOT}/usr/${APP_NAME}/" - # Web setup script - mkdir -p "${WEBROOT}/usr/${APP_NAME}/bin/" - cp "${SOURCEDIR}/pkg/linux/setup-web.sh" "${WEBROOT}/usr/${APP_NAME}/bin/" - # Ensure our venv will use the correct Python interpreter, even if the # user has configured an alternative default. # DO THIS LAST! @@ -265,8 +255,5 @@ _copy_code() { _generate_sbom() { echo "Generating SBOMs..." - # Note that we don't generate an SBOM for the Meta package as it doesn't contain any files. syft "${SERVERROOT}/" -o cyclonedx-json > "${SERVERROOT}/usr/${APP_NAME}/sbom-server.json" - syft "${DESKTOPROOT}/" -o cyclonedx-json > "${DESKTOPROOT}/usr/${APP_NAME}/sbom-desktop.json" - syft "${WEBROOT}/" -o cyclonedx-json > "${WEBROOT}/usr/${APP_NAME}/sbom-web.json" }