From 61c769beee87fc448741d406a6ae36324d68ddc3 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sat, 12 Jun 2021 10:04:29 +0000 Subject: [PATCH] cmm: move install to misc git-svn-id: svn://kolibrios.org@8823 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 2 +- programs/cmm/installer/Tupfile.lua | 6 ------ programs/cmm/installer/_compile_en.bat | 9 --------- programs/cmm/installer/_compile_ru.bat | 9 --------- programs/cmm/installer/img/logo.ico | Bin 3326 -> 0 bytes programs/cmm/installer/img/logo.raw | Bin 2304 -> 0 bytes programs/cmm/misc/Tupfile.lua | 1 + programs/cmm/{installer => misc}/install.c | 1 + 8 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 programs/cmm/installer/Tupfile.lua delete mode 100644 programs/cmm/installer/_compile_en.bat delete mode 100644 programs/cmm/installer/_compile_ru.bat delete mode 100644 programs/cmm/installer/img/logo.ico delete mode 100644 programs/cmm/installer/img/logo.raw rename programs/cmm/{installer => misc}/install.c (93%) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index b86ca2f436..8c1ad66c46 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -669,7 +669,7 @@ tup.append_table(extra_files, { {"kolibrios/drivers/drvinst.kex", PROGS .. "/cmm/drvinst/drvinst.com"}, {"kolibrios/games/pig/pigex", PROGS .. "/cmm/examples/pigex.com"}, {"kolibrios/games/the_bus/the_bus", PROGS .. "/cmm/the_bus/the_bus.com"}, - {"kolibrios/KolibriNext/install.kex", PROGS .. "/cmm/installer/install.com"}, + {"kolibrios/KolibriNext/install.kex", PROGS .. "/cmm/misc/install.com"}, {"kolibrios/utils/appearance", PROGS .. "/cmm/appearance/appearance.com"}, {"kolibrios/utils/dicty.kex", PROGS .. "/cmm/dicty/dicty.com"}, {"kolibrios/utils/notes", PROGS .. "/cmm/notes/notes.com"}, diff --git a/programs/cmm/installer/Tupfile.lua b/programs/cmm/installer/Tupfile.lua deleted file mode 100644 index 08e6f2d4af..0000000000 --- a/programs/cmm/installer/Tupfile.lua +++ /dev/null @@ -1,6 +0,0 @@ -if tup.getconfig("NO_CMM") ~= "" then return end -if tup.getconfig("LANG") == "ru" -then C_LANG = "LANG_RUS" -else C_LANG = "LANG_ENG" -- this includes default case without config -end -tup.rule("install.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "install.com") diff --git a/programs/cmm/installer/_compile_en.bat b/programs/cmm/installer/_compile_en.bat deleted file mode 100644 index e82d55a3ff..0000000000 --- a/programs/cmm/installer/_compile_en.bat +++ /dev/null @@ -1,9 +0,0 @@ -@del lang.h-- -@echo #define LANG_ENG 1 >lang.h-- - -C-- install.c -@del install.kex -@rename install.com install.kex -@pause -@del lang.h-- -@del warning.txt \ No newline at end of file diff --git a/programs/cmm/installer/_compile_ru.bat b/programs/cmm/installer/_compile_ru.bat deleted file mode 100644 index 9833164277..0000000000 --- a/programs/cmm/installer/_compile_ru.bat +++ /dev/null @@ -1,9 +0,0 @@ -@del lang.h-- -@echo #define LANG_RUS 1 >lang.h-- - -C-- install.c -@del install.kex -@rename install.com install.kex -@pause -@del lang.h-- -@del warning.txt \ No newline at end of file diff --git a/programs/cmm/installer/img/logo.ico b/programs/cmm/installer/img/logo.ico deleted file mode 100644 index ce29b7da594fe55d80721ddb84b0b0121e0a9a99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3326 zcmeHJdr(wW9KL3wY;xMd0lZE-3N=nvcU0B(LeJ{K0i%kZDaq{b&Ll8LEp#Q4z+d221`}=+0dH#N9 z566umKezcDdAf7vi5xeLyPX0t&ml_GlQDew__;Fo8EU-lXJ zfDG__0{BUE(W6_|m+ktL# z8-CTdpi6xlj`l|MShb8t`BXO)4c`_sz4engw4|;<{f33OuwphuA)dIo)(5)SAf~50 zAvAtpI;gL!D95cj5zZ8rpzy?(C^(TjsHZ$3h_9YS?>!rAHARB`n@Y3M>okM%gkaK0 zA-P_LZd04!{JTvG=BK>J!KA%|rW@tx?J^HrKiVd>Q~yXX>twj|!}&oyU32=qAEp{79F8>0BT*B6b+Nu9>uo&cMX{csgowglyGCh*Y zu3>9I4Q`8X61#%=DNhLUpG9o{nq^{S*UL~X)giw03O3}55S3GnCP@R^Kgtur-CH%I zieJhTLTh8~sPvR41ckV6RC>x2LS|J9mSlbdKA{qPdvzhbx)KBD_el9a(*Mu@E&s`V07J`Df9}<76VN$D`4b#zUR)3Y3{aQ0!WOVE1QO8+1-r-j9=fe8%A-YIN z(_+~B8XVanFcv1j($@zI@hMYYg8sl#T;Dc_tw-?8anNM&(Czbwa;qDxRx3-0d*o@1 zeHy0RSU8B5!cKgu_^B{v1ws2!078iN;Onl??0gxz3_qwgjwc)o<2s4Nl=33Fi1uE; zoZY!pnf3C8=jN3mIEmC`Y)SP$$kr@rp^< zw{RTV;-^EM>ipnZP^S%+yvJ06Rs zk3s7eSF~-P3Hb^a81x3v6*LpAHft&LZ*p)roUDIirycSj4yt#jqBV9h)6)I>I&>Ub zV_eW2<_aTW(wnI|I~?XzcW4r)!`_SjHXi^o(#PFR6PRWop8cQaAc-6c={i?PHcx>p z-47!W0MQJM|8=uCh{HL^BRF(?5dlZ}9@x*M zz;@~bILdaxTABuB!VHMRI7AZeQ0+k7e;S9{WgKLy$sChBU^z|n=l4OM9R_*KSkx@$ n;QySkcAyP9ryw%6-QFB>{QApoFJdEY56pLf`{$dy{=4`CRxVyq diff --git a/programs/cmm/installer/img/logo.raw b/programs/cmm/installer/img/logo.raw deleted file mode 100644 index 66ba96cb8e59124d0dca8f22eb933c06d650fc3a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2304 zcmds%drVt(6vwY(SX~^CI3Xbmf-q)~1>p(~1oz_QIvMMj47SM_sfaiz@(NVIv8iNp zBZG=Ow?P&LV@LnC&8B*23BpJaiuyEt zaey-4&$L3|1fhRS2$D$;PizJZ;N5=Dh);RQ3j9UMB#l~Q2W&P~?LPH8h}pbI5QKKY zB#KAmA8Zw8djeb&?JlGGDT;!n?~>-V>V?HWOppFF+H9I!53^zxc*DF-nuw@A+9s#^ z)I@J;OWYza2*8SWNGT+IK@Y&9LA$t0z_M^h>^yFekrAvoSds7Fk-ViN$xB5G!AisA znIs&CaDdlYR~}pc-oVjhGAS|;P1#N*E#zv7_qn$`lw~`yib(nKO(xu6=WT?J_KL-3 zTe884FdB{WlbhA_C`Ebr`8cmce|KdCiq*tObG#hyUxGVkKc{14n{9Rn6OPNNTeY?E zs!wB+{Ou{a_kJK&yIWGU17BUW5Ckku^)7RLlC~|+V6z!kSEaPq)OGvDPlq^qBjII| z8^PwP0sJA0#CvQ&~LC^<;d+FbydHpE04^3}H z6Y8T5T#CzTO*qp>K6{tmKjXlhzY@;yBa_x5pI$a7ZC0~YFZ*3Bv?!*{bL?eY1y(2N z*ofIf8}MLt;U7-1fX6@26&4>FITn38c{?*Hc;aw4mK_i82dfJ&`jxq|WHhqc`E?&o z4lz5vX=gMvjpU^0y6RUJ^cYd( zpcc+f46Io6lA8>Ohu?A*+(7~TY1pAGV6%c>ZaeY=VZ$Dj^y%3Kx{}2x-pg--RQ}VgvJpj1W3+@X#SY2E=_ijKw*Q_t(6Ra*g`^PS*R~2)r zVN5tIP#5;x&uL|yYPmzZc^@tgRu_Kq`wrl5jI-}>#B8OmbM!X`YpjVm+WEuJz=PGv zFE20a_4)^_rVaWBtiS*XUhw(z`TWeXYbd1|+8EvcB^q0SqIu|>1?Zj%l>7yn(VSV@ z$>Z^WbpFeKv;Wu3{|5a(E8x_R2nP8WwQKAcgPGAZ$m33K-2a$r&RMT%&cr|Ie}l;g y^^%CV|NH)jdEzpE9P?zo{)c%r+}Arb%!GN;*7$X6Bf~MT*6aWE=G(v7|9=7Yt6nky diff --git a/programs/cmm/misc/Tupfile.lua b/programs/cmm/misc/Tupfile.lua index 8cd25bbe67..74eacc3018 100644 --- a/programs/cmm/misc/Tupfile.lua +++ b/programs/cmm/misc/Tupfile.lua @@ -4,6 +4,7 @@ then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end tup.rule("easyshot.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "easyshot.com") +tup.rule("install.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "install.com") tup.rule("mblocks.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "mblocks.com") tup.rule("notify.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "notify.com") tup.rule("osupdate.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "osupdate.com") diff --git a/programs/cmm/installer/install.c b/programs/cmm/misc/install.c similarity index 93% rename from programs/cmm/installer/install.c rename to programs/cmm/misc/install.c index e920978352..745323f815 100644 --- a/programs/cmm/installer/install.c +++ b/programs/cmm/misc/install.c @@ -116,6 +116,7 @@ void EventInstall() { ini_set_int stdcall ("/sys/settings/taskbar.ini", "Flags", "Attachment", 0); copyf("/kolibrios/KolibriNext/settings", "/sys/settings"); + copyf("/kolibrios/KolibriNext", "/sys"); RestartProcessByName("/sys/@icon", MULTIPLE); RestartProcessByName("/sys/@taskbar", SINGLE);