From 1fa1beb1112d642ce7ee709b012a5ecc700abdd1 Mon Sep 17 00:00:00 2001 From: Ryan Inch Date: Tue, 2 Jun 2026 07:25:47 -0400 Subject: [PATCH] Remove the last bits of Mozilla branding What: removes Mozilla branding/references from the habitat scripts and the default link for the model collection in the upload object dialog. Why: this is no longer a Mozilla project. Note: this doesn't remove/modify non branding related Mozilla references like credits or code/dependencies as that would be inappropriate/break things. --- habitat/plan.sh | 8 +++---- scripts/hab-build-and-push.sh | 2 +- scripts/hab-wrap-and-push.sh | 24 +++++++++---------- .../room/ObjectUrlModalContainer.js | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/habitat/plan.sh b/habitat/plan.sh index 65c30f56ea..5702564afa 100644 --- a/habitat/plan.sh +++ b/habitat/plan.sh @@ -1,15 +1,15 @@ pkg_name=hubs -pkg_origin=mozillareality -pkg_maintainer="Mozilla Mixed Reality " +pkg_origin=hubsfoundation +pkg_maintainer="Hubs Foundation " pkg_version="1.0.0" pkg_license=('MPLv2') pkg_description="Duck-powered web-based social VR." -pkg_upstream_url="https://hubs.mozilla.com/" +pkg_upstream_url="https://github.com/Hubs-Foundation/hubs" pkg_build_deps=( core/coreutils/8.32/20210826054709 core/bash/5.1/20210826055113 - mozillareality/node16/16.16.0/20220729014143 + core/node16/16.16.0/20220729014143 core/git/2.31.0/20211016175551 ) diff --git a/scripts/hab-build-and-push.sh b/scripts/hab-build-and-push.sh index 3b7f014753..42d724b7e7 100755 --- a/scripts/hab-build-and-push.sh +++ b/scripts/hab-build-and-push.sh @@ -32,7 +32,7 @@ touch /hab/svc/$pkg_name/var/deploying rm -rf results mkdir -p results -sudo /usr/bin/hab-docker-studio -k mozillareality run build +sudo /usr/bin/hab-docker-studio -k hubsfoundation run build hab svc unload $PKG sudo /usr/bin/hab-pkg-install results/*.hart hab svc load $PKG diff --git a/scripts/hab-wrap-and-push.sh b/scripts/hab-wrap-and-push.sh index 0b8a92799b..6b2e0c28bd 100644 --- a/scripts/hab-wrap-and-push.sh +++ b/scripts/hab-wrap-and-push.sh @@ -13,14 +13,14 @@ dl="https://github.com/$org/$repo/releases/download/$ver/bio-${ver#"v"}-x86_64-l echo "[info] getting bio from: $dl" && curl -L -o bio.gz $dl && tar -xf bio.gz cp ./bio /usr/bin/bio && bio --version -export HAB_ORIGIN=mozillareality +export HAB_ORIGIN=hubsfoundation mkdir -p /hab/cache/keys/ mkdir -p ./hab/cache/keys/ -echo $BLDR_RET_PUB_B64 | base64 -d > /hab/cache/keys/mozillareality-20190117233449.pub -echo $BLDR_RET_PUB_B64 | base64 -d > ./hab/cache/keys/mozillareality-20190117233449.pub -echo $BLDR_HAB_PVT_B64 | base64 -d > /hab/cache/keys/mozillareality-20190117233449.sig.key -echo $BLDR_HAB_PVT_B64 | base64 -d > /hab/cache/keys/mozillareality-20190117233449.sig.key +echo $BLDR_RET_PUB_B64 | base64 -d > /hab/cache/keys/hubsfoundation-20190117233449.pub +echo $BLDR_RET_PUB_B64 | base64 -d > ./hab/cache/keys/hubsfoundation-20190117233449.pub +echo $BLDR_HAB_PVT_B64 | base64 -d > /hab/cache/keys/hubsfoundation-20190117233449.sig.key +echo $BLDR_HAB_PVT_B64 | base64 -d > /hab/cache/keys/hubsfoundation-20190117233449.sig.key cd /repo && mkdir -p dist @@ -41,16 +41,16 @@ export HAB_AUTH_TOKEN=$BLDR_HAB_TOKEN cat > habitat/plan.sh << 'EOF' pkg_name=hubs -pkg_origin=mozillareality -pkg_maintainer="Mozilla Mixed Reality " +pkg_origin=hubsfoundation +pkg_maintainer="Hubs Foundation " pkg_version="1.0.0" pkg_license=('MPLv2') pkg_description="Duck-powered web-based social VR." -pkg_upstream_url="https://hubs.mozilla.com/" +pkg_upstream_url="https://github.com/Hubs-Foundation/hubs" pkg_build_deps=( core/coreutils/8.32/20210826054709 core/bash/5.1/20210826055113 - mozillareality/node16/16.16.0/20220729014143 + core/node16/16.16.0/20220729014143 core/git/2.31.0/20211016175551 ) pkg_deps=( @@ -69,13 +69,13 @@ do_install() { } EOF -bio pkg build -k mozillareality . +bio pkg build -k hubsfoundation . ### upload echo "### upload hab pkg to bldr.reticulum.io" export HAB_BLDR_URL="https://bldr.reticulum.io" export HAB_AUTH_TOKEN=$BLDR_RET_TOKEN -echo $BLDR_RET_PUB_B64 | base64 -d > /hab/cache/keys/mozillareality-20190117233449.pub -hart="/hab/cache/artifacts/mozillareality-hubs*.hart" +echo $BLDR_RET_PUB_B64 | base64 -d > /hab/cache/keys/hubsfoundation-20190117233449.pub +hart="/hab/cache/artifacts/hubsfoundation-hubs*.hart" ls -lha $hart bio pkg upload $hart diff --git a/src/react-components/room/ObjectUrlModalContainer.js b/src/react-components/room/ObjectUrlModalContainer.js index ef7fd0a4fc..e5718589af 100644 --- a/src/react-components/room/ObjectUrlModalContainer.js +++ b/src/react-components/room/ObjectUrlModalContainer.js @@ -19,7 +19,7 @@ export function ObjectUrlModalContainer({ scene, onClose }) { ")} onSubmit={onSubmit} onClose={onClose} />