From abbf751685fe75c1240ae620ac7de88d334bdef2 Mon Sep 17 00:00:00 2001 From: Clement Tsang <34804052+ClementTsang@users.noreply.github.com> Date: Sat, 25 Oct 2025 10:30:17 -0400 Subject: [PATCH] ci: use icon in wix (#1840) * move icon location * fix gitignore * oop --- .gitignore | 2 +- Cargo.toml | 5 +++-- assets/icons/bottom.ico | Bin 0 -> 32038 bytes assets/{icon.svg => icons/bottom.svg} | 0 4 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 assets/icons/bottom.ico rename assets/{icon.svg => icons/bottom.svg} (100%) diff --git a/.gitignore b/.gitignore index c26efedc..dbb6ae74 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,7 @@ # Flamegraph stuff flamegraphs/ rust-unmangle -*.svg +./*.svg *.data *.data.old diff --git a/Cargo.toml b/Cargo.toml index a2c94fee..9efe9b71 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -206,7 +206,7 @@ assets = [ "644", ], [ - "assets/icon.svg", + "assets/icons/bottom.svg", "/usr/share/pixmaps/bottom.svg", "644", ], @@ -226,6 +226,7 @@ depends = "libc6:armhf (>= 2.28)" [package.metadata.wix] output = "bottom_installer.msi" +product-icon = "assets/icons/bottom.ico" [package.metadata.generate-rpm] assets = [ @@ -236,7 +237,7 @@ assets = [ { source = "completion/btm.fish", dest = "/usr/share/fish/vendor_completions.d/btm.fish", mode = "644" }, { source = "completion/_btm", dest = "/usr/share/zsh/vendor-completions/", mode = "644" }, { source = "desktop/bottom.desktop", dest = "/usr/share/applications/bottom.desktop", mode = "644" }, - { source = "assets/icon.svg", dest = "/usr/share/pixmaps/bottom.svg", mode = "644" }, + { source = "assets/icons/bottom.svg", dest = "/usr/share/pixmaps/bottom.svg", mode = "644" }, ] [lints.rust] diff --git a/assets/icons/bottom.ico b/assets/icons/bottom.ico new file mode 100644 index 0000000000000000000000000000000000000000..63acfb8adda278f523d12473aba4d01774162f64 GIT binary patch literal 32038 zcmeI537AyHwSXtzm$w*&VVR|8rl+T8>6xCMec1P52SIiaSp?Yx1mXgUXhhirL6Jpd z5ebNhpb`WnaY0aUi5j2!VvGq27~^~So|>0W^S)^Cyz^K0ZSKt6UWQDB0q6T_Zgt(d zx9Xfar|O)lbIwgj_(8%C6RN5b^y*FUcS}gqNJwqkh;*^0d73`f^sOd2PZO{K zBd`K9u>XsuMVh|WbiTq}6E0u{W?&zz>3=oVtaHBq24-M?`T~UA8e3rhpGfehglK|m zJo!lPiBz7_BuI1CHBvoO-sF;CpRH>wdbR3VSLgb`?l|Akr=EGqva(06bj?kc4&LS_ ze`$V-w9ITKcX!W`p#hhaW;B&$U2|k?S-QBK+put5?dodYNCu3{kg1EZ#h2eyqT-;* z#p14LA^Eo~7f;t-k{TT*b3ZL3P4cdpE4kyZ5m!p{YHi!_e9D%uRwu1lBU#rwPflK4 zDXV+t8W_oMzSJi_>6j%arc}tTfdw+Boku>LTp>Rn9*_c8lQ5k`dN1X`>hm>~d!H|o zM~+n(JR~;`jjt096<*&BcSyz2lTx^1i@1`TRqJc5wi^G);HmuC-$?1+*CnH@LQ)ei zj{b~8yLVP)%Q1y*L1(Yr+&;_X@6mCe**a5xH>q4U_4Uc5$_#mbV!7hNFF7fRal@bE zZ6bH>DU@yRl}XPbE{O`i_C0sX^-_N5m=w&vS5lLjM298uN0QmLgOu%iQ%W9rLDCBg z>kL2qUXtEaCRSufQCd^+>)4JjPnQaJGs#mpuT*+(<7qD5H(*z`|(ileOF1H{v%yQDVL_dE0< zS{eQ8tGo^m^!BAllKxK8eozi>$OEsH=Xa6f3;LL)^pPH;P56JvWVg&*o+AbRIQYL+ z8!5PBwPf||7aM-?m6;*F>*g!nTqmy7q&maTIIdUNKUSW|u9p5Mvq2!|au=wpCCRo)&~Dtm_%Mx6_RKRYW?7Vh@TmUqge z`@lH(f5J>DfBv^-4M=UC7`;C_U$|ShlhQq}N%2F^N_s(o(oEgvKj^wJt%;0Q-iG)2 zZHLz>pV7Rr4AC{Qv(5#v>Vt!d)=AQRkV`UBWAJB)p1u8tO1jS%oBrvm;)t~}vt6f{ z{dR(d{tYZll`Z}9o8-DPW<&pfGmrCBudE#;6mUp6`e2W2gqOI80=Nl%W>E6BSpm1nd14wUrVoY?eFJKC4b zPTkBrSXbJozw~c-kxL#`8F#SG1DER9?$&Wd)iP6VDvvW5Ita@0ygGR=NU;B`j?KSd(Z}viQrKQGx#x^$e z4_J_IS^w`>{znf&{@>O=Ulw-p$_dRsG1zZ-<0I7tp1-^(?sWp(7AXI(IUM5uNpbMM z(mm^cVAb~c_`m0+X1y%iul!%xvd-&2^oz{@?p0-GKEI}w+vIQ8Ie~fZo$+Nx2fVyE z&G7sKiYxd4*qrFyUPhfPccR?7HD5NqULu|Q#KHfgCP~?WcZ?oXOPW!H(U`kJEEE8|_nl*rVFc$xNy7iHw4Npk+ zh;gUaa>iL{J8<7FqwA+8H4WlX`@)#}mu@ujBKWC^vsgHQ|DkF4e?y9~~acwW+S zvV(AHIkbYjT(Chu3=K9aLqtE+h-4fJi6(^~oeU8#SuZn-seL*=7IbZevjIwf- z{hyJ*y4|PoQj@Qu{HE`~fKC(dz6LbYOV@w)#~9;UaNFABeo;v?Y2Q6X(o`3YR@d;q zE5*q3X<3=3F7mD6`Q}ZGerL@K=)FeXRs6Wyw3iHYKX7GhJDxoKyGrMI_O;M!W5L7t zx6NuUkEx8XyjzZVSPP=GiOw^1VYV!O+%J`FR9}j*{%7^ROp3QWB{`!e8o7o%dqQR{ zfVPzuGD=F#cq8|dM^`Rbutw6{>2=1zKf?d7{4@ApVKVyvz1zii{q0h5sV*%p4aUA@?^E{fwZkkHuE3%EZVf^>AQExC@Fp770JE& z2FdC(KuRBfS$wk>oZbu6I_{Qjq~zh}#DC`oBli|<-e+XSG;da&$Dh8#_vpUB0zI(C zyLD|x7bFjj)8AsvvkyqVQhC4Heu2WoUT1EO>O-3MdJ-isPxFcc^j`R%_koXml?lna zU5(B95S|wlxA3&5Yfnk@DF3T&pHW zfWuc5o4vh3st+*E^HeWH-+6XKku2?+ZE(XpU?2C~+$QpqZTYg`QNNV8YA$ou<;l{$ zg;LozNoL%YBg>x-NSn^dGU+z2-1}USbn2BNqp$ZE-MGhK-4|kBVElFOqh!ZH$<=)z zLnF|$6I_(*{0|-i>vowvgEWuZxvqsbhb!aFUca^euhKIB^4oQ7L%u=&|C!20oCO?L z`TwBe19{Mboj#(|w(gW{_PE&R9x**r*1uXJ4}VZ@_CBC}_W#g>mOmAcM^983JS^Ph zm)##%nzIozFDjhOX-58M{g1Vu$@<@`zpnou*!cfPVcs(MbAZ`i4jj{4y5)$j=aY4h zAH9#Y{aTd;*yDm0fSo;Jbf3F)&WAUuy+dgsPse}$_5xX?dwmr;&)>M-C(HH~O3U_1 zGVAVKx#yW6|4+FiTUH$`GP=On*&ZVs^&F~lr#1cqhD*t=7bSPnwbk0Nw-?T<48T5l z(S|+dyu_@TPP7sO2f$OVds^&eA?LHFi(CtBkVhwAKY)EN`+OJf2k%!L!25>hHP5~$ zd%u)t=^hArAoY=l{Dr6a-ydkIdco=Wko|o2F@s|t-+GQbc&4yhFxX|-nt6-X&72+u zm*&30%R3|G!ADpIu;=aXt>Yf9nIFzz+%4F@zuM@}J`UgKW6wd~GTYX_X$BiB- z@BR8eWz{_^Br{d_sA}LKLt$UJ;x0LU{3AJW{J18r>Zd6Y|oFhoyb1N<%AFJLl>( zO?8YXf3`>X``h3CCO6%1T{ZZ@Ps_3*`Q#6OFm>YnH}A&T(!9|{4PtKCym5UPtUvwf zzh&6K{*t7!HDd-X6#25{-FMy&*NK(+```aAQzndW5b!g;9a^`L-@NzhFj()t{kF8J zEK~YDtxF6U&`;Liw?;OtUnd)*q)i*{7sfs(Gp!mOovZXuzZmN)h7Xa?KKm?;gMEAV zNS=rNu;6?c&%AHd;eFO~=Q7;Y`*w-^WZqo)=IgHw4!-^NTe)ZXGTpO`VS{m=$Ulsi zNB3SH+PWo717CjmrA(bPp+U^!)yMM8TIo6Y&FGE3VY^k*0ATfW z`b^&sI`utlgA#&^-!;peo~u@dy-CPErCPZiS1Jodyl2&;j&nWw{$xL>~Vm%ipNxv*F*`@62?4Mr{nkWmbQztIG2D4@dEXH_u`x>q>WNz80*t`i?Eo zIJFCYa%iFP6WF7^FxZLWE5Ay8Ww0H^cL1LNyWLQ&J}T@JZt==(Y9nUZNLH((ayYh* zMH}}>_QXT*)Cn01JMHEB*`EwZEbE?bqw|mt#w0QI~9Ezl<;Y z61DN;9yYDb6KmlkjB9K(uV0;KY}c^g3fnMQZR%N>yH#7`ho3k7#)$pLMzQFDy=t?( zEw+81z8iYQ?hM=PJoQt-4l|(khs0@UuL+;^K5CnXjVku3_@q?BYp8#`r$xIY!PXL= zY^OTVjd$P(wW$n5qHpt@r(18y?9e%C9qawj1oq_z)V>_w`DTh^_?B`KdCIyd{+}5U zFg{04bcDSuwxjqGVry87kD(v61;~YY5aAin_lV{ z1U*@>Sy##!mp8_i%1q@Ar#j&L+LgJo^4TJ1KX~oGyQTUvs_k>0+CE3>KX(84#}qDq zFmC$6h8ergtdJeE)o<&{7;uj|(2zB+TKBnvZ|wKG4N&^gv9RB>@`ir!UH1E<(uSw1 zr~3JJj9SNfC$vE9iRaYz6dG}&4a)FUqz-W$oa)f$s~2P&`&7$D(`v(9p&xunwjMCP zHj(g;j}fssh))qSK1Yatm@i*d`+EFlm}9^%_%uoLltEj}P1mR`ZY27dwIWwm90(Zu zaVPr6|EFa45y_o=U1a)kX9Vq~mu`x=PJkEMvFHceSA1T$LMOz5u*#T!;O|KOK)k2^ z=%+`W=m-0D?6#*U9UW8}ncLoD{M{c^yKijUv2kZEwZ^6zT__It4gE}8k}Y@stkA@C zam2s+;1sK00A%iD*DT91Hrd!EJN6%6N{yppZ10sH3?7hkY!c;2EP zd<>zLHtIVBjj*PX$Ww;BHDeIT2P;1MX=eNf!t;;zo&Fl%2;2Fcr>buBgMIwb(Z$kT z`PW*%=#NPXBW1);dPRAhv5LgM_(9yYU->r@{?*5^DJMqUsoGadQC(cryekthN zqkGZ@|7&)Nf64l|@DKe=QTm6*nIoO%M#}JQr4Bv-PIV0ZFV2=F8q3G$i?IHdSC}{) zIpe3RpO)HwY04Ql-S~63D=H=Bl7BPnZ{f;q#$U^&c6ElvLOkY_hn|^#pdZT*$EhCc z7j^1o{ZjjT{7NzcMcUs~<70q5K7L2wpIAGYZR20RkO}awf<~NZgEIUHse}KuQyt_7 z{3!1JxyGMTUjk^a8XlBZ@c&}|$9J-D+j2Y>E7={wvHs_-`5i zEKA4I{q^+xd?T|N`KNuSxa1#b;aZhHkqz+4L5?6^54sDn8PH|8hiqi&FZdV}Ym1m0 zV{Y&m-<#{#mD{h#6eN4u_xW=gACb-m zDd!9|Qi}B4cRBW)ZTfR`UrhPS-Y$L1al3*(4fr+GNR`Ef>K73^CYt@7^_}M|{>o98 z8~gJq6UK$@aZKOU#(MY8N95y^C*{Nm^-HLcPM$m=Z@%%mRCQ<@ey+az7wdiW|L(h% z8v6pvmXtE+rLv?jF290_?7N|_P#^KZ;qRMo zzLEL2++2;9W6|N+z7G!b)GuoPlY0#epMUfQbnRVq z$9y?;>XhJHvTVtsTI+GVxcIK?v0jZIbA|l*&wn_sNXdY#@QZyceEdX58`~s*{nz38@l~QL$secu6Vyv(+|`l==;C3hym=h zyqc;sh3&NTn?DYAT3vL!-qrM7^DAxA_F=1S_R-k8teLF+Gpn9;rM#B?2yie*Imx1? zyxROl+vYnyw9Wn_XH%TvU>CxEHfKHM`V9kXkI&wAK;sb-m&+h}Z{9RX+Q1q)V- z_p)KZy=QA&_5HqCw+7=uIn3eUoV|R`C^(zuOpz;GMnu-ouC$YNH*6 zpV)J?V(4o7#Mt7@FnkVb^-Zr9{KO7spV*=S_ToG0dHD9r^3C{I;{g0aH4f-BJxi+v zzuFWK|BM)iVVr6Ec{6S{=YUS_+u>(_+IlWX7fnrUFJjhN?T6tXURU^gMuea5!w@^2 z_*oYGj5}x2PVf^4mG8l%+WKq8fBs5^U*o#{M&a+kv=18!=F8LOzjw|jK9XDG~c6fXrJ*XPTEGLcjCzNjhrpY2kSMKEN7`r zYJBg7@gFkDEmvzy%v$j4nU;xr5BwI-GyZ(vX2Oh!@N;es{G4-POUM~0=USD@1H?7A zpPMrN#3Jl_xdZ&e#s<%swQbHgO-xbM`H91b&6gAYE%-Uhf&R_hrhG*?bJ0(AUa-f@ z1AgM*Pf=T(TJYbxLSvr~((}rTH2(Wy$-aENq+I;3f<0aCRo6JS54{0Db4|L9p6Ca7 zz&;VX13Uc_hnDZLROkOh{qD+GGuBr8^>lxs84qHSM}vQGAl2AI+UXzur(evAz|T1+ zsreXI^iGq;WO-p zMr!Ov;@ENyez}f2Yk;vW)jI8z<~h3r?%vA#oU1_t#N_Xx-==USDg26W?6OSk$)>tj zu5p%$KMPNK^g9Di?K95Ajc5LY1~`u-j`A9{59KV_*wiSTSNu5Bd;{jD4L%bO7F#A_ z1i}Y1)Gj66)y%|jHsg=&fHlV|E#^&|BgUq{f&Zw-{7wvS&g2+tVs~>kXSa9b?2T^` zU_VPta?WtGZF$~fV(L1aX<{>IV#`~7a=1cYHB%S{>gyO-ykWmu<)*IUvf49NJCsMd z7phZp4~yUEJoZ$xj$>O^n{~LNAF{V;f4^VjNwL3gPsIhf^&U?I{d&ZZf%4*^7o=0$ zR_2_bP-7JwRzL1fKmDWN!%h0*A3rhsmR&oxtJnPl+V9u9hkWt*=knY$zmRNg(T=fJ)r0zKD(w&Lw4bPlbt&q6FOe~y03%TN-dA+-LsaO7r)n8(a zaXv`Aj_){DPf-6-8Y|Avm7y9ljCn9tf9vT!ZJ*XZwGYrhJ-s`g_t171O=nI2)*XSf z`o}&6+Y(+);eCo9>W|v~WJeem?1O6B2*oj8M^wH$g&fPbSg@laCO2{}vLoLWFyGW@ zthQTfyNi996(1klMU~f1As^zK!#94=573F&CrDDggzu8I>7q8Fjr2Q;9jlD}9kMt3 z0DM;oyF2T7d`yt_(5KL|g3qfBoyPPw&v)oz?5~2)w+-nL!RK439zL^GrqR*)jtt+7 zLKd!QUHf@s>({#a^XT#DSjf@H)a-RQweQw%2l6eHOtq~G#=<|{f8tjocM<2A{v)fk z&^-`h((}zY;K%QX=W@nO3GD*}pC{HkHvH&w^xv1RHiK$kH*Bg~hEH=#pW*uLh^}4K z|EHbCY*%}(PF<^giwnJ=KxI?x4s+G^i!%VPCukRjJy?!c&)?HEK0N*?iev1*>^5Mm zCB&b?ex*$J;aivMcSrOblXc#bB_q)i>tcu2l_s`ji_(BR_`pVa<`)M{%m?CmazE0u zRyp$;=XHx0+%Cv<$X5l~`W+~>8?fp`yD~@j?a@^ZJiXtXx6)?3YcutbsUCi4t2u*< o_c^OS+SaL7imz#tC&b-f>sh@LH^K04UE2-4