From c98d6b82bf7defb8f5321a6752284d9c1b06e6c8 Mon Sep 17 00:00:00 2001 From: novusthedev Date: Sat, 30 Dec 2023 19:15:57 -0600 Subject: [PATCH] New changes to ui --- .github/workflows/build_daily.yml | 6 +++--- .github/workflows/build_monthly.yml | 6 +++--- build_daily | 3 +-- hooks/9095-setup-os.chroot | 10 +++++++--- skel/.config/dconf/user | Bin 7899 -> 9722 bytes 5 files changed, 14 insertions(+), 11 deletions(-) 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 b95a0e81cd298ef5516b92624a2bd05916bcb921..d8aededbef7d75525f4e4b64d879d208df106b43 100644 GIT binary patch literal 9722 zcmbuF50Dh~mB)J*Q2r?>B6x@{i*jJ-ofX!w;J*bHk+{1cyAZf&pl7CMr`ewAvAbvg zNIWs>iFKYax}}782CdWRse~(&h|1Mroyp~{ypu{uos}5R7>!UG|Ai_&y^HtxcF)c% zyDNd*RDJiodELK%@ArQ1z2BQ%x!&>}D<2xA&va<>#OTXhZ$LPRR>2F^U=$b)P6A`W zI52($OhBeCPbpy%R5%Ts4$c5m!I@wh&>RNi&-i{$3Fksdz_zLt|@Kvz61Phu58PEwFu%(19=m1>!9LR%>-tE89e6*kAjc#KN zbTb%t_oegKBNsmjc>#JoxU=iG4cZU!DDE)}nJoiIC0o#|?eXM@OPvHHrr(#2( zr$ouusCE%vtA8wQ0#E(OMCG;wA@CVh#XMDt0(N7Ds11x;*-K6>vuXSyP zrogp7ofXLT#cMvj&>O*~&)%K661jNE?}F|G|NQ>;CpCZZW9k3zpnJeW52Sxuja>X_ z-ro!T28U<;t{ET6w#92*_e1xB%laB>=OY)d_xD5pjg394_P;OGc@cjS?;n631beRQ zv93lg{&e0y1brK{jQ^j1)qaWB{(cOto?;mHE_ zoeLJN9rLNyEB-Y4X@Xt>UV3D1T5|D{Z-6GjS1;W6o_v9L%|8qEz^i@Vd0qAGV?roee&l`rO?M zkc*d|8=<{8zWy)HdA1q3c-i50=uU9osnga-KjP0pz8Cre=>PQgA4)D>{k#l)72Nz+ z-`uMCh(87S`_NCpJL`5g%cqFfJjbHk3E+YaXMLS5jrj9fS3R;uu=qz8uhu?_mmg?` zZUFt~TbokI#cQ5f=#d$QasTLT&t8LE{8;41*{mI`eQ?L~Iv3(K?qui`@Zp$cSRkKk+9NpIpMuZJ#{{6FXajrL3YB-V8$ zbPc$1WwIOQ1@N75w=I+&#LJ&-gWd)HYwFW4Yo6j|54)g`fX5m(rIsKU zuW|Q4zYjK_@!3|*N4)&WKInchz2&aGnvZz(a{&4auzU5bJEb@A@=NbS!&=V6HT!;5 zja9dla`BqaKIjYJv6+eSE0K$j{0a1Ra7Xpa zyW|JNkK+A9(09Ny+yD0$N#x=cr;b1;5?D5#`{H5gO}yq`1HAwwCLCzd{)$&zXoNO_ zmma;PSN(|Bx!wT123)n~t_kwD;&rY!L$l!HskfacJ&V_V^+In2`@#jklHSBCF6@9l z1XkbJ6~#^QIxmkxe+-^~W6T43UwpJ)=xbol)92M+i(I_?&mrjO^9K8jaA1!x~QT>NB?>_NQF z-CfXKV9y)I7L6-@7V@7!UjpYnb<*uxuXyDZuRvb|wPQ}+F8dd+ao>l20#a6JcY3~K z2du$tFSf5RH(Ko-tkDWmSv%EbhEC27LMvA=-a4<_rVAFmE_7Tcq)~#fX>@?ipaxjo zR%rQV!3%iq<&ng94#O!psj%qVX3=*dDfzJD+Dj6NL^1FaLDur^MAAxib^2a0pAHh8 zc`s)ta-LtvdYyLO4xGSr>w@l1!w7<`*JB3G^|qPv++r>shP*Brcz$Sle%kgKgB95M zw3Am0jb)~?o)_4@?iJI)1z;%{12~pZo_{5D1vm+?l~EoaqaM^l^rMHC64oAiavv$rlJHxJpk$hm&yn=QU8`0-_&&$zC)^<9xp_%cm zRJ_&y{-QqbTyCV}l}ZWKysx;YoYpE7q8_51HLau{)}`&BEA$FREDHL9(9W5z*I9m$ z&!NzK-j0Sa?X(kme)*y2ch*HM>ynn2w2~t{SYB=%jPSJC-eNTu3nM+jT3NB>_l@{4 z=!!RQq^I_v=~rgBqT9)*>=8P<0?S@=P>er~*NjINqhwYX|?RbSONs~)U+ zzUtMgBUNWqf1$dg`nu|ys_&`ZRn4J974h6;_sRjs0r_<0%N!>o1voh6b0FhzouqGj znT&&Nw1{6F^GW(EPv}@LrYtvgTrWDgf^P>Er5vl%v~TqsSEuYv_PAc`@tttccFn^{ z{iX3;Vj8vtpaHzpm&I*8@8Y88|RwC((3W4^ghqNV-Me%=MYLch_yQig`QiWyDy|O$DNR z0axSXGv0`CuPJTkoS>^wz0`H4$Z;$ti7t!DsL@Qyk5?MDakKG&@r-fMIAYAJ!dhd) zG)ao$0D5qgVQeGNRiRsBuHz)<4YN2i**6f!Jb%68vo6=XkPVE~l(TwGhcFkVG;ywA zIIb7F_1GrWHOkML$;j}tPTFP%EgyyPNghw`kf4MR)gc`nv5b}C*hIC|TI5)JRO?hK znM5YnSAUt~^siro1S|be{tB*E0!4~})I`!J4 z+QYtRqsxmJVn%B-U5@JxYrE9(3$B&7|LFYJdUzG`o8dhaL$4-!dd&5gyyw+&@x%IP zDY=xv%O5iTW42$87x1k=wRNkLBAv_w0<@S(65WKk`6UK7MJP|i?;%dPCSWyqRZ?uCez#O1@0e57>1w(R! zIKJU;r_e$M@c)@x6C>bnj(~(FNF4^&oz&lz*9N&JT|VN6$p`J6ybo z4ENE3#T!~z9DPhTa^VE^9NEBH=#xYv$|2*#;d(Y{jxOBf zAoHROGfSv1C6|Z;SAG#nsuB90YsSfTLiLzG*K-w529~5dU&c|^#V46|0wt1Wltvwu zOzJVu2W5K+{XRMmYytdyWy}C`0j2hMj8f4i)+oup((`!BqTg-T@t*8JRT0^$K9_-0 zK;9}+dn!itl~sIK&3ll7`S$;*E0s()YpH5vD(_Z*fk)y3!OG$kQbImfx+kiX3|MwR zdP90fHl7ZZmffM3oPj($VVum@9O=0#P}ATGzLTTC5Lb-&KHI*qv0)J_3b1&SRdtcG z#z%ms{B~9@cTm*`sk&4ybJ6poif)mFKhC&mhP5^5zF~&eQNF9`@zD2UJ0Ey|qTzT0 z$*`4k!o`gX8|$bia9S&sifELf{m29>D}CRbJKis@|(Qx4N@> zD+P|oib{9SQoVR(+v?U8W~GjKI=7>N2&JP@zGP|y`SpRyQbM+-!&RwdazD0GPKYbr z`7M18Q%CH{>HO>Wx>B7ek%3qJU%#1|KswOxb3@M(qCw{=-pSH+Gr_&f_yVxIDIP1? z;sA#hbM;l>l{#EMHwOegZ^re7@8 z%cXrBO}SV*o;Ih0jMdFA0u)?$s@#E+goUFbAUJt0y zqbmF463op4`MFXcgOW#&7v(A{UX&98W7+DCj@7N`F}`>c9$nR{RJw>_g?iaU$%uqb z30lx&yVN>tLaIec8&A$4%FOa6cBUex2IJGPu#QwkSw*Qt!Tw!@Jjzd^Cf^nj6hyA z2qWR6z-Tb0f^o=8E4Umvp@NCXE5X&n;8W=Oa27w}EER0$Rapum-eMuok%v ztOsALU;}a^xE*Y&;7;V`3fhrBYqY7TI6TIhOVRE&^W{|rl0x9 zEO_(ClfRmZUVJRimyjVCcgXw8%g~Eo$@BLicY&LKbjvE)LwpSSJ;?o__rslkBi|Fh zT;oT+2>#)n9ZzYU#7AlT$k)L8dww!r>m@#s=T9R)1b=eLRjukr{95!=FE)%iaC+js zGpf;xYn=0u%fKs7j{P(FruZcE?Z^x$-SCsA^}KjIFXUFx``*^+OVNv0^ZYjC1E77v z*{xOR#YZyEy~yu@^?R@RK=u?Li+(@yF!+m ziu@9|r?CE{)=OOLTR?6HYd1ari+1$lV|acS@-gt0lMnxe_LBI;=no*D1CLKhjnVkU zHLoMcpMliaBP-Rv_$Bmz0{ISjY2Ws4*-c!2GHN{Y1Jh6c#+CiWFQuQU(t$@F%D&u= zUR?ICMZQI#nYHPmKz=2z{?8z*dEwFBkGE)j#Wl`J$OT~kabwFI^y1Udwt_RA9)b;c04&( z_7~T>yny^M`0{) z{~Yw^y0GrG30-OgCAV6UHywsr2lakeKNSIuCzz%E3Wu61K9w+{@HJQQ}IV!`>PQd zfHxlX4{2WFn%6eu4lv{U7wuI4;@U^O$laj#dTVnndU4r#AMy#3%X=f16egn=zY_fm z$RC3r9D27pi(Xv)A447orDJcuqIDFPznw;Ynq>6b_j=YT*NJQ08twS%a z{@al`uyV|qf0o~hYhK;RuY<2nX{eH3T+i=D{wa9z-|GHI_7NY?c%DT5HF)FUcb7Gw z7nhw6AYTF>yfJ$IJoMrk&uhq2VCSgfu6lV{J_;U|20QBS6ud=fSd$=Iq{ie zdR|<9TZ^m*ZPmXUp*$`=g6A8Mjo`bZ@13VSFD}1rMYe+-OY2W-y~MRHE^<3K`hyFM zvs~g;=yxD@f!-Tu9#l>h*Lv+m{uOv|`7;lwe{ty#AzuWKy_vpB@kCtXd<}ULZ29(u zW!X(!{(K5~25h|U@JacVxSqchC-@ZDeD>`r>PK95n~humUU~3u=gAJ@TK86D8<_R$ zC$5@~UR-wAfZPOLdaO39e#8}@OUS#yopYZ5kHzT4w$6kP~=t_3OR2$$e=V{BycmA@F6qT(|3>5r@bh0i@YHJb;?i$G z+TgalNWfcILaTqe7T zYdoW_MS{m0HfLJUi_3o|ASZ#E5hHiV4&r)mEpjfHF#73#ls(1u{6b_CSo84iA1cm^ ztN&JH8~9pk=V7g*xb*GF`@z;fe)XWnBQE`3!F*CmF2gdZ-@x_h2=NIkNBHGBVOdG%Ed-$9-XPwYWyS7;l?ZC9VBijr69!cjMZe$9+&%M+wv{?%*&6xcaC2)I}D zJty)5Gc9X+o}J+b&*)n31X0;?O>7r-IbPQ9N?v;Vg@&IgS5|-o0R{QD`HPD!-AE?u%=#1SHA18_TleMmgjZ-ju>q?$z9va*s|R; z^c+8puqTY{V#-(yj{?gJT?P-=h5a%Gn{|wwq8&z7v6SfFoY9#)(jBi<!qYGKK8Ff>L>#@u2aH@l)g9jq0jtRX10)SM^kVtLot@yvXrN<;V>Ea*+7BYVHvr*{r5( z_4sABXne8gMcXScC_0`~WOLUMa}ttq34l0Dm+fYVv}V?^SbSQC^o<93CLX1z8TZpL zub!|L5`9wfcY>j@w-R?tfm0j^=Cqt{-Ef07TT#c#WNa_0gn1)t=d7~JD8rl+@W!B= zyoXr~iK~en6+>VuH(*q_OB^y7S%j`J&~x^;o{L|0)~2(TPHZqWZ|r6pYru>9jIE&8%Q!Nc;|> zg4I(fV=!aLz?1CLNPh5*a=PqAWs{}HLUK^NwJ}k~FN~979Euu~a1hULkXh>U83Lij zAjt&fblhkPru@8N8}}Fw8P6I=jZ?-f`C^|nv_1>K;20>IZ!p`+ZOhD!R@+)~s1>q# zf=t0A2WuHM()_nU#*97n_N_IVTFru*wm2)TAT!m})wovLc54=RW!J5%>2yK|N3B^9 z1!emyb^R??l_NHOTNKzY5pQdhwNHEpJ(!)&?ZSEmsg!{yJny5dA^O7xMe%?{itxh4cC{v^K0@+ z-!yckTm3FOXbpTh^to&@v~7#dd@J?m9Ah2Yu*nKKWY2Rn8{#HwavhHAo}z)65~y zYUB7$+W*)cICMqmny8(egTiyPx5taUW#dtOxT~s`|6p>AzuF%7z66T zpm@!xH;50=pEz!3`{Q<8rLnVN0>8V5_q6hkkTj9D0uD>rNVdEW7>@c# z#s60t&(AA?%F6gip!-}_wo9evyo#a2fozzfl1ct=l|#-4*Ml~|E8}m@`cBtZW3pM5 zf{mjj-)$VoVmnf6re{^EJgP6sMcm@TEfE zFI-s(C3S)t^nH@Jn{}J1gS5U6P*G`(wT9C{0pFtX)Pas)_&Lryq-^i6+q