diff --git a/.github/workflows/build_daily.yml b/.github/workflows/build_daily.yml index 8db630c..95776ca 100644 --- a/.github/workflows/build_daily.yml +++ b/.github/workflows/build_daily.yml @@ -45,9 +45,9 @@ jobs: uses: "marvinpinto/action-automatic-releases@latest" with: repo_token: "${{ secrets.GITHUB_TOKEN }}" - automatic_release_tag: "bookworm-preview" + automatic_release_tag: "daily-build" prerelease: true - title: "Bookworm automated preview build" + title: "Daily automated testing build" files: | - *.iso + *.zip diff --git a/.github/workflows/build_monthly.yml b/.github/workflows/build_monthly.yml index 4f1409e..9aad950 100644 --- a/.github/workflows/build_monthly.yml +++ b/.github/workflows/build_monthly.yml @@ -45,9 +45,9 @@ jobs: uses: "marvinpinto/action-automatic-releases@latest" with: repo_token: "${{ secrets.GITHUB_TOKEN }}" - automatic_release_tag: "bookworm-preview" + automatic_release_tag: "bladeos-1" prerelease: true - title: "Bookworm automated preview build" + title: "Automated monthly build" files: | - *.iso + *.zip diff --git a/build_daily b/build_daily index cf2b309..3647d4c 100755 --- a/build_daily +++ b/build_daily @@ -20,7 +20,7 @@ cd $BLDDIR # Set up build environment -lb config --binary-images iso-hybrid --mode debian --architectures amd64 --linux-flavours amd64 --distribution sid --archive-areas "main contrib non-free non-free-firmware" --updates false --security true --cache true --apt-recommends true --firmware-binary true --firmware-chroot true --win32-loader false --iso-application $BLDDIR --iso-preparer NovusOh --iso-publisher Blade --image-name "$BLDDIR-$(date -u +"%y%m%d")" --iso-volume "$BLDDIR-$(date -u +"%y%m%d")" --checksums sha512 --clean --color +lb config --binary-images iso-hybrid --mode debian --architectures amd64 --linux-flavours amd64 --distribution testing --archive-areas "main contrib non-free non-free-firmware" --updates false --security true --cache true --apt-recommends true --firmware-binary true --firmware-chroot true --win32-loader false --iso-application $BLDDIR --iso-preparer NovusOh --iso-publisher Blade --image-name "$BLDDIR-$(date -u +"%y%m%d")" --iso-volume "$BLDDIR-$(date -u +"%y%m%d")" --checksums sha512 --clean --color # Install desktop and applications @@ -66,7 +66,6 @@ cp ../icons/* $WKDIR/$BLDDIR/config/includes.chroot/usr/share/icons/ cp ../backgrounds/* $WKDIR/$BLDDIR/config/includes.chroot/usr/share/backgrounds/ cp ../logos/* $WKDIR/$BLDDIR/config/includes.chroot/usr/share/desktop-base/vendor-logos/ cp ../logos/* $WKDIR/$BLDDIR/config/includes.chroot/usr/share/desktop-base/debian-logos/ -cp ../os-release $WKDIR/$BLDDIR/config/includes.chroot/etc/ cp ../issue $WKDIR/$BLDDIR/config/includes.chroot/etc/ # Copy resolv.conf from host to chroot for online actions diff --git a/hooks/9095-setup-os.chroot b/hooks/9095-setup-os.chroot index 10fabcb..2a01e30 100755 --- a/hooks/9095-setup-os.chroot +++ b/hooks/9095-setup-os.chroot @@ -9,14 +9,18 @@ set -e # Change live user ln -sf /etc/skel/.face /etc/skel/.face.icon -# Add logos +# Rebrand into Blade OS mkdir -p /usr/share/icons/desktop-base/emblems/ mkdir -p /usr/share/pixmaps/ + cp /usr/share/icons/BladeNoText.svg /usr/share/icons/desktop-base/emblems/emblem-debian.svg cp /usr/share/icons/bladeOS.png /usr/share/pixmaps/debian-logo.png -# Change installer icon name to Blade + sed -i -e 's|https://www.debian.org/|https://www.bladeos.xyz/|g' /etc/os-release + sed -i -e 's|Debian|Blade|g' /etc/os-release + sed -i -e 's|GNU/Linux|OS|g' /etc/os-release +# Change installer icon & name to Blade sed -i -e 's|Debian|Blade|g' /usr/share/applications/calamares-install-debian.desktop sed -i -e 's|^ *Icon=install-debian|Icon=/usr/share/icons/BladeNoText.svg|' /usr/share/applications/calamares-install-debian.desktop @@ -28,4 +32,4 @@ set -e flatpak install org.mozilla.firefox/x86_64/stable -y flatpak install org.libreoffice.LibreOffice -y flatpak install io.github.amit9838.weather -y - flatpak install org.gnome.Geary -y + flatpak install org.gnome.Geary -y \ No newline at end of file diff --git a/skel/.config/dconf/user b/skel/.config/dconf/user index b95a0e8..d8aeded 100644 Binary files a/skel/.config/dconf/user and b/skel/.config/dconf/user differ