From feb669a476a8cb9e97cdca987f1518e16eca428d Mon Sep 17 00:00:00 2001 From: manuel Date: Sat, 25 May 2024 11:44:08 +0000 Subject: [PATCH] some cleanup --- .../deb/scripts/bootloader-config | 1 + .../calamares_settings/dev/applications | 1 + .../calamares-install-peppermint.desktop | 21 --- iso_configs/calamares_settings/dev/branding | 1 + .../dev/branding/peppermint/branding.desc | 34 ---- .../dev/branding/peppermint/pep-logo.png | Bin 15261 -> 0 bytes .../dev/branding/peppermint/s5.png | Bin 55094 -> 0 bytes .../dev/branding/peppermint/show.qml | 40 ----- .../dev/branding/peppermint/stylesheet.qss | 163 ------------------ .../dev/branding/peppermint/welcome.png | Bin 11204 -> 0 bytes iso_configs/calamares_settings/dev/modules | 1 + .../dev/modules/grub-defaults/module.desc | 6 - .../dev/modules/update-system/module.desc | 6 - iso_configs/calamares_settings/dev/schemas | 1 + ...calamares-settings-debian.gschema.override | 10 -- iso_configs/calamares_settings/dev/scripts | 1 + .../dev/scripts/add-calamares-desktop-icon | 35 ---- .../dev/scripts/bootloader-config | 48 ------ .../dev/scripts/grub-defaults | 53 ------ .../dev/scripts/install-peppermint | 26 --- .../dev/scripts/update-system | 35 ---- .../calamares_settings/devld/applications | 2 +- iso_configs/calamares_settings/devld/branding | 2 +- iso_configs/calamares_settings/devld/modules | 2 +- iso_configs/calamares_settings/devld/schemas | 2 +- iso_configs/calamares_settings/devld/scripts | 2 +- 26 files changed, 11 insertions(+), 482 deletions(-) create mode 120000 iso_configs/calamares_settings/dev/applications delete mode 100644 iso_configs/calamares_settings/dev/applications/calamares-install-peppermint.desktop create mode 120000 iso_configs/calamares_settings/dev/branding delete mode 100644 iso_configs/calamares_settings/dev/branding/peppermint/branding.desc delete mode 100644 iso_configs/calamares_settings/dev/branding/peppermint/pep-logo.png delete mode 100644 iso_configs/calamares_settings/dev/branding/peppermint/s5.png delete mode 100644 iso_configs/calamares_settings/dev/branding/peppermint/show.qml delete mode 100644 iso_configs/calamares_settings/dev/branding/peppermint/stylesheet.qss delete mode 100644 iso_configs/calamares_settings/dev/branding/peppermint/welcome.png create mode 120000 iso_configs/calamares_settings/dev/modules delete mode 100644 iso_configs/calamares_settings/dev/modules/grub-defaults/module.desc delete mode 100644 iso_configs/calamares_settings/dev/modules/update-system/module.desc create mode 120000 iso_configs/calamares_settings/dev/schemas delete mode 100644 iso_configs/calamares_settings/dev/schemas/96_calamares-settings-debian.gschema.override create mode 120000 iso_configs/calamares_settings/dev/scripts delete mode 100755 iso_configs/calamares_settings/dev/scripts/add-calamares-desktop-icon delete mode 100755 iso_configs/calamares_settings/dev/scripts/bootloader-config delete mode 100755 iso_configs/calamares_settings/dev/scripts/grub-defaults delete mode 100755 iso_configs/calamares_settings/dev/scripts/install-peppermint delete mode 100755 iso_configs/calamares_settings/dev/scripts/update-system diff --git a/iso_configs/calamares_settings/deb/scripts/bootloader-config b/iso_configs/calamares_settings/deb/scripts/bootloader-config index 8ef0da74..521dc5b9 100755 --- a/iso_configs/calamares_settings/deb/scripts/bootloader-config +++ b/iso_configs/calamares_settings/deb/scripts/bootloader-config @@ -12,6 +12,7 @@ if [ "$(mount | grep $CHROOT" " | cut -c -16)" = "/dev/mapper/luks" ]; then chroot $CHROOT apt-get -y install cryptsetup-initramfs cryptsetup keyutils fi +# Update packages in the repos chroot $CHROOT apt-get update echo "Running bootloader-config..." diff --git a/iso_configs/calamares_settings/dev/applications b/iso_configs/calamares_settings/dev/applications new file mode 120000 index 00000000..3bcee520 --- /dev/null +++ b/iso_configs/calamares_settings/dev/applications @@ -0,0 +1 @@ +../deb/applications \ No newline at end of file diff --git a/iso_configs/calamares_settings/dev/applications/calamares-install-peppermint.desktop b/iso_configs/calamares_settings/dev/applications/calamares-install-peppermint.desktop deleted file mode 100644 index a03cf28d..00000000 --- a/iso_configs/calamares_settings/dev/applications/calamares-install-peppermint.desktop +++ /dev/null @@ -1,21 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=Install Peppermint -Name[bg]=Инсталиране на Peppermint -Name[es]=Instale Peppermint -Name[fr]= Installer Peppermint -Name[hu]=Telepítse a Peppermint -Name[it]=Installare Peppermint -Name[ja]=インストール Peppermint -Name[pt]=Instalar Peppermint -Name[pt_BR]=Instalar Peppermint -Name[ru]=Установить Peppermint -Exec=install-peppermint -Icon=install-debian.png -Terminal=false -Categories=Settings -Comment=Calamares — Installer for Peppermint Live -Keywords=calamares;system;install;peppermint;installer -StartupNotify=True -StartupWMClass=calamares diff --git a/iso_configs/calamares_settings/dev/branding b/iso_configs/calamares_settings/dev/branding new file mode 120000 index 00000000..fa31e26d --- /dev/null +++ b/iso_configs/calamares_settings/dev/branding @@ -0,0 +1 @@ +../deb/branding \ No newline at end of file diff --git a/iso_configs/calamares_settings/dev/branding/peppermint/branding.desc b/iso_configs/calamares_settings/dev/branding/peppermint/branding.desc deleted file mode 100644 index 34a7d3ba..00000000 --- a/iso_configs/calamares_settings/dev/branding/peppermint/branding.desc +++ /dev/null @@ -1,34 +0,0 @@ ---- -componentName: peppermint -welcomeStyleCalamares: false -welcomeExpandingLogo: true -windowExpanding: normal -windowSize: 700,450 -windowPlacement: center - -strings: - productName: Peppermint - shortProductName: Peppermint - version: 00 - shortVersion: 00 - versionedName: Peppermint - shortVersionedName: Peppermint - bootloaderEntryName: Peppermint - productUrl: https://peppermintos.com - supportUrl: https://sourceforge.net/p/peppermintos/pepos/ - releaseNotesUrl: https://peppermintos.com - -images: - productLogo: "pep-logo.png" - productIcon: "pep-logo.png" - productWelcome: "welcome.png" - -slideshow: "show.qml" - -style: - sidebarBackground: "#C0C0C0" - sidebarText: "#000000" - sidebarTextSelect: "#ffffff" - sidebarTextHighlight: "#f62817" - - diff --git a/iso_configs/calamares_settings/dev/branding/peppermint/pep-logo.png b/iso_configs/calamares_settings/dev/branding/peppermint/pep-logo.png deleted file mode 100644 index 16792ecb836130cde3d0cb08d1e113490229a4e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15261 zcmeHtWmsHWwrx?kJ0v&-L4vzma4#%qfTAee-GaM&2<}oi1Pw019ReW`EP-Ibf&|MW zIj6f%zuWKL*WdTvzuxs#QG2a1$DC`dIoD>_+EHLNd29?a3;+Ott*9WQ`S3UJ;T?pA z^6-gf*5CjDkX8F=>$zz{JZYR<94)NvU^H&tPB0pnm$d}|;I-V8Y3*Sy;1c!|N^A@) z?Wv=P-SI*-?&^-AA1kq`c;em?L-1Oq%MVvlW`!2udB4+Ld&6;`mKihl+;F$V>;6lw zFGYvd{h4FOQSZ*>-QCSSVfWANmy2D-SHp%;dAs|FU-qw$F8dS6{rs_vKTHW2m;_{W z-$_rITsn5IeBGB)q>JuYG7;D_5l}igi#T=dqsBau&6hi2*25&@TYrrq6F-`Gyn)z$WgQUcEWtqOh$=N$b!TAf%G zAhqCffhdkG7I&4M8ar>8kIdcZZB(9ipR{+?PU^avAAvr9?JS<%x{7vTf7pgC@?UO`zm#9F$Cs;9k!Ksg?BtdoBnooGeu+7pC_)p8W<#4c-(4uJP@8YR7Fu$d}xQeLlrfNE-Y`OxKVD2ZBpUfC^JK`fTmS*7BXCUI&Mg!0(iFwwZ zP0ld8MZZ4kVqCW9y*quvvv1YZWi+-D~QvXGpTA*wuf29an zts|!BPP6c&UW(^P826578~&^m5%&~kXOe?&oGeKY^mp<6f2~`07*UtDkD4MyfMu4wu_R2TnW;RV;n2d|d^2QRHS~``<@P!piHP5_6WH zshB-;>NlQOo2vIB5#&1SvJrfR#ki;O_#@dAM(o&fSD8tqlOVifhf^Qeh^(Y7J!53@ z`hfMzM1e-z_@X9x#rF(PGRu&g!SZ27_8M8;5ZLph=C+FAc31rp&78&pu;p%*Mx0FQ zqt7VIscnzcD|)ac>#A!+E-yaN(wjY*2J=8B`gi<_Ojdcs%#i0IM2vl^GO;-yyM`h% z40OJ~@c1!bDxNd=y2$>!j2vAf(;S()IMPpGI!QxV_vzf-b$B(UW3KDrv$!|F&BWBs zc?T=py@DcK9%+lf&k)u_*Up<0gf73s5M17urk~HY5F^JIhA3mSHG6tmlrg^ZNvW*) zi1M@vDhz1i%vFhEfxZPjLF#$kUdsvww~uQu8$Nqs4-N~T7tXP|AR8^rY{3jlLw5!S zraMx-!ie)D4(?b-&iz!CNIflEGvN31G?p9KgSDCv!B?JCOB!&YMI`ONI;%J~@N$ZQ zHHDzgZNOd<- z@|m$Ex=tS{EuXBUV(#i&WRxZGzc|GQ5>{&hlP|K`YB*8CEaQh@r)0oNQAnA1{H)-+ z7Z?Mrkn}Gc&wHp>`47SPSu}mYGAJvu#afT`(1?xGqdOD1$5$#sw?wK&2Sf$bAD5k# zb!>K-aN=bUerMx}Yc|~qPB+ZzOZSrtT>z3HrGKVrwzb@r2@G{NM zJpMcS^YxOAMc~yakmxI+ke(g@iZJO?C4m&J8_ZKm0^)npiuD+o{bGcCpooCRpOfTM zM0gJtXo?lU97wU`BrxC9Mn0x{z(Ml$=*~@|TVqSC9y6ERYmDb|j}T~^cA#8`Xmif1 zIk^mn^=HJ+UfjItw=Z7yctIQIZ??sVDPjClcqjizab2CWJIT`P z3}CB0(hq_B*jngWi%u+H3GJchv#d}62pC{i)9&ybT_78$Cu!^=P4rP|vuw1FJKiAh z>@?5pp%gF#Hx@XQjtv*}Kc=Br@45%RQeE37<_}qUf=IF17qjHN zE^ii#l{p-<5T8`;r2WjH?_*OHm0mY``eN_*_(vZX6HYPegapM%k-Rs zrDP>zu>1C^_kK*`=eitCUx&IA*LN;v$TkYoSW~tEm>VqTC5}4M7fgXV2#rHAh(WIY z+KEw`t&QJ}L>B@j?4q|z|H&gUo<2J9Lb?=x&`L8dH~XqLoe#nSU%D8pZHN(h{K^o4 z8z&nNY#K8ia5^X6C^afF0mF0DFBYR`pvat47Equ|oTNew4|XL=bmow@rJUc5mFFhD zLj!Y*P*8cxrV(;YGpvmOX*43$<*{oK=rPQ>{9!=5j5cKzpYjFL<8PvPQtR%-t2%5wN>B)r&5=}nMQXY+AaVtyPbtVa7X3<@`!|Y6$O|J1VTzA8Gf==U!XvV1w5f`GKz$d;01v(ApVDX^_ z;3^HaColr#4Clce9b^BGkN?D1c^x8@&=!vUCB&D9s@iJ zda{+ReA>_Kk+ptP{B9U#hS&8^>20GY9**7CQdK@>|Lz!qW-xX(=2+GOVG?Kjr zkI<+OOVN8fJb}^R8mUG5BJMwu&Zj3QQqSb4-=}ph-iR`0un9e-LeG3bxA44P1cuic zn_ojOO7txCM>|^4p%x8Rl1w230x z><|>ET!Lb~g3uNLXJ}{~bo;`_*o9GB~^`tCO!&rbT_aOo|Skb(g7O4`3pjQN*#-&EDqq)^MoSS zwnzQLK(I3FQKYCp`_r^OzP3SUyGoC?+6JfeM)wc`u@V|Y0Gmi4npkrv)zZ(;qzv*5 z!8)-3gaR4$0(sor>{InnreRM~yl$+oh)cX+41KzHU@@hhkp(p=ju?Ip=BdQ#w1G`t zmpCDbu+YH`U^Q|5@M!cljvCYpiyJEr#>gCDKpO2hVR;ZI^AtX|1RO?AesM4?TJGpC z#LCIXW9#~A8X;f7DMP5R>m+R5Mxk*{YnUW2Q`=Jh6`{UWG|^{*uK7B20xCGEfWRJ~ zK$CC!ZPImQ6$dSaOX7t8Op0KI%T$)j_xT(84P4Cd7niS1AbM~#lK?S2*L5n6>|r!p zO%n|sKhc;)FA7-#DMG_#O{;`LR1Lx{)HkHoQficb`)5CB*1eGM09q@wg{Y6jm`Gwr zrk^7!XJfAOgB2$jibGHu5S1tq2E*?91VeILd2Mi}A$VCy1>2-i zn=OcBk1=ufp3)H8Mt#N!Y61a8y-hk;H#>D=sPWHtZCSwq29L4caC&^~^y zdaf)jRy6a;ufDbTA`L>_Qa>J|v86QzxCzvX-8i7hhTcV8%Uzi$yuvMIr^K9O&Cf0V zthmAqU9b2MO{9Al`55i;^QT5FfOF3qs(5*s)V*HLN*Q{WlufBjulz4+#?~_%QzB#< z42xOjHiXO-Inf7jHSSyeS2{(Qku+qVw#DBINbQ9qZ~87G~kXSBM%RI%v`>>w*NRk|0GNh#emxHuzKE z>4)XErH^lNf}+DzLvB%E%2Ag{XZq`q3Ux;>Bp1>isUd`!J@MQqtFJQY*{qpQzm*GG zOl0QUR7PYdI6W5zE5zIkh3zCSgd5L>EBTcZ(t_uuO$JaZeKa^TCRshsde1LCwA&t zn*iJPQ&b`*yaS)292OabkaC$`DRPa(r=@kFu`umw=E6Vi-C=nP4= zP_ts}Sn52!?2Ol$W}%4vrNr8&q`7NzyZq1NK-1Us9aAL6Y~XI+%B8ak`LMH;M#)=dd-*3+d8i^2>n-y!AbL}t9!8@ z)QlzD#`zTTvcp1C2fQ~9X!B`_P0}*(@>X5nRLp^NkR)nb>`v9MXm7MSLE|_{z;0g zB`QFHU>%loA-5D}O8k4O3InK=W`$+hs!gC?0c;v9fP{!P%*{AHMoX#s7Qboe#Wb|s zC*@hn?z@Y0wo7??ZoWhJ)g+}DeG(G9c~x>^R6S}@5+nzg8YbCfVv`q$txDEZ@6hd2 z(iz)26C+e6B}-!UGhCAva_XimzM73<68lEE2d6Un;m+5I$J&oomR)OXJ?iEs zKiGgivE#i>{bEq)W5}av8k~wP4Bge(MPFZ(^A{49A*ewlYcHohVQVy*&ec$@e_!d5 zl^dH>wlYjo7*-XAhjkVt&Vv0d-Nr;j*xe6)jhYB~hY*#!fFqsF%A4l_ZMm>zE@Kx% znVS#OL>yoKXn)tsk9iTm|Ja26G6ou3B|AKU{(x$*;wL1-*0|T&0u# zfg!&5CJ2>%2m;19PN1a7b48(&KF$*v1z?laqYaP2N!Fr@Dy9g$Bjf4ZoC@8Y&S^g2 z-!O`V;@XYyHbvBipees)Q3+8BKPW^>Ii?Hl!6Ka=p~rY8u#O3~Sq@8-cIt+wVaSVB z0QtUG=mMa4X*4{??xHGUn0&tZFMvTKPv+NWWKMDy8J^1qmoPB_m-F6H1I1L#g^!a-2gTfDEd;+^A0E- zyyzPY!>)RpNs!9!aiEgJzImTV9&ztm!ELNHzWWA2+SIMGVROInYT4*zB?pe0qX+~y zN2{aPMJF$wVBw+?;4N=6n6zMM84jM&)*H0iBhpydz~9Ct42u6s-+_~cM}Rpyk7~M1 zaEMtPHd%nS$b{oa)gPO%CljMS5U|mca5IO=DD!G=Kd^tB1~?ur92iC;Rfn(`nQT~7 z-iVdQpPx0GA-HGrB1=OjqIKRU6z9nZY`#sKyaykL`&`vRmS7d#tqqB_N1w_bf8O&c zO9dpNi_3om-1HN`aIBT`xPbaCz%`PEuZo9$=r~!KyF>1Aj|ti|3tC^w?cC>ilnHDM z&Zq{{1B!8CDlGf#{-+_bamNY^HL+}yslu!U;Z1<98}>OW+Bm8r96Kvgj^zXEEo%*w zuMB$Cfj${TP3lh^lu%7MRq2Ti(wbv)hGH=8)+4tn95io6Zk)(tIthQwoxl*aFPSb> z;04J+bmIE%3}GN>8g1BJ#EE+V2Xy`HMu?+cGFv|hH)bb4heC>M4A-7p?mh08MbIaq zuPS4WHX*kX89n|Q`Rn?R5GW%R6#TaHc@}bC3_e~M4N1mDQ*o&TEJl*lsl~{}>c1h+ z1Kk?DneDvr(|^N#yY_l{;Erax3r9n8Ix_W4NV*`UUwF>-*tVj8rG))0zjDg$_l4n- zZ_{2*yuy!ldNah|Yv0szI?t#v1gc(TC9ehnGiTn;;Hbi*%S`$2KA!2Qsb}D(`o@f! z{iybPb$4QUj6}pIw@|PpyzPR6Df}4BNk$ri^rkBiHw6!5sG+@1u4p42tQ-MzrY&Xr zQJ6!xvvC`}Fx%L>aMglGt)T>>Gh##%YFfbG@UhkIk~gq^^(Y06$RO1ZmAF9l^U25i zkuM|2HHfG9&_u159+WS`#ugZ*@b}^~D-)4xBvOOOSe1y~xP6|lTAm402b$Kpob+%x z5k!!oRYtpN*eM9upz5|Xee_$v7cg4KaNVwc5dx=_TY`8C;S5y7)70PUN;?sM-nM;x zp;D{%yhGZZiKzCSMuY^(!@R{=U8-}`;iJ&U4YJt7HT+J_#Aw+-vv0q$Du>&=nF*fE zy}NnyAq%9oLuLOx*jI}!v~9jaw)2&pqTx9c+J4S}s*yxRBk+BDWlBAddInv8yN%#tjtmm|+wzBQ3Dy^28V)W|>BBqg@o83#a|bpbn6 zd}Jva+R`o%77~(>7sPMy_9w&AvGh9<8LgB?(%K~>N)f7CvGHw-yc8Q4QqS?e6j6w! zVVy28i7WY@(iw=tM}N{2H`!Muy} ztdwan7OY9edt7KOf?436x?^mgE3&@F>H5Wevt4eS6rv=Y6G8q;)GSh)lV7i9KWO{o zQ|0)tX+Z^>(swy8lK5$VCh};M_4W+r8{?U!5|ytfoM20b%-c3-eg;g%-R|JzuV7NQ|3nrL zKJ$%RRl9xIzk>bCjVo&>H|Vd8E3s%UoIp-2#LJFgMkEp7b#^)I>${$xVOa?B9v~At zamSWwqKFd=nV5}&AIJx*y;_z8Zm%CLvn-Gv7G8o>W|6cU&cVd1;uq$m5M6N&5CDJ> zYAr1dR+N_h+fLboo9vfKVha6|6oV#OO|nmMJn-Cy!8xpv(SkO_(O}wnjB4Qwqib4T zYXwas3gpG$5b78mR8q?qlt#!8zvc}r3@XmZD&3lBTH$Z?I!k<7^h`()$o)SZyee8*s5pn_;W)*OQ| zWA5@B?8%z}jpxZao35K0DeMZj!|sDy0+X_@kaHjN@$3q1GS%zZK}+KFN9H3LqoD9o zt**p#y)PYu`YgKoXSugwNgZ7s1MZp93T6l~i8Rloh{>7y<+7jW5Mf#`t6yEA8g5Wvoe$;MOHLImC&#j7-Ki^h4Yu`yD!-A4<*l^lnYm zQVGS{rZ-FY({Hhjj9PeMxUDM)*LheUQeQADXfY85Uh-U*QcQbdy4Cu0@?AP#1I)`S z=dqof&|-<0eJ6HSH!eQii_IMzp`IPNxcOm3u>b(LG1d<|mwKuy!ca$hc8Iy78I0Y_ z-svGT002=5FDD4p7Uo7{2D7ww5Ca{(?FP|Un~Q;T`BXVooupw_)(So@FfAW7ZK#he zRLC48A&w#HCHz2O4|9Xic-h-IxC(oTfqwG}KYahy%mJeL4RNy-1L>)PX`~%pU^Kk! zyzHE8vR>96+#qob8c`Q>3t>$exj!i$&cr}gZf;J(92}mWp6s4H?2ay$99%*|LL8jj z9NgS&4+u6_ZwEJs7n_4C-7ktiIAmb1P?v{vwsv%&`Nat_b98qT1A!j;Y5pYtmF%)! z4~>61_;vo9-qp>VL-FB+_hCE_01j?WPC+(KZZ>Wqj=$PJ^s1`<-P*zRPZb~Z&x30o6j!^esP8DUuK)>P@Hg|+t zn+yN`3bhb0;}Q^ru$jT2{A|21ehW5;1uu+^3&sT%;^yKs=Q6kW3zedSs~f}t3j0O% zK+bOcz{Af6F%#sm;A9ho3G%Y>atWES338c3*@SqZ7To3nTrdH?zf!2XSU*$(#O|+A z{h~5|pn^cS`MEeDFg9~Ru7_yM1%%klcwt;@yaG@NC%-ul%!2n1s$cUUECp5+197u+ z{*Lc=3)l|gX5r{!F9uSvc5wIlM~AkxJxt3D@=G)>egPpNZUJ6SAwfYd0e-%JfS$u# zTpyDB7bh1dJ2&_59&@O$+yf)zA=#|$A(k)>CkM;l9lxeU_+c;)!a{!4#sl;3_J^?u zOS`}zZjLV6j*fO>pkI;E{G$9_QZ%A}7K^ZoBlNf7Z!paKSH1mNanB%@9KTORIsQBF ze__(Ha`bfgzvKA_^zSTEE^eNVF1G3}>Si`DsM~+f^RK{vXVQFF>s;MjycPe4LH%zy z(Ld5v;lb9?#rrS*wP4PFoc*yN*;)UViiYO*A|MQb{vp3B!~8WmfGLit^Y+D^9os*aY4)=Y@Fs64;jY=HD?oo@^P_2_&J5R`M4px0-Vr)W_NY8 zaPx$?z@#i6a^PW}A4==@Jkv1!&OYXUMtfSp9&&_*Q%IPT6ZFUQ(ui{WT2TKsJkeiE zj;gBgUj-2TwIm5E{>nTpcPA%1YnaPF3-h-``9I+PV*h7S{!iwAh5cbI?datFP_$NV z>Yfh&t^0og{DVQo8VYl8b^Px_|10DVS^jd}d5HOswukH4!{w3V@7Kpa)8bd<{C_q8={}%W^+4cWSE{uQNVZ$6A{?YS% zxPO+yv3m1x?~P)nEH4B2`RkS6S(ft9g6^cC@A~iv^5U;I!ZW5UuZKodH$_!h)UQYg zSeS&wwJBKu0L}+R87XbA<-;8BM4g44A&Kr!)@1Flq<0p!c8P;XoYk!~&&|@}1GT~o z2)Pg=oe2jI-910wZ&|s#_N#2a?!1{4yIfg2^7S7R+R4Sl`LD+auHtr<*1}IDIl1!o zx3a}6_&sk&ClN*sD5=njWxo=bAgbO^8OoS<(MkFdJ@B1qpUU4rgOTdA2ylL+GhNm{pV`Dk8L!%Be+-6(d*cu8x5z|h*Ou^{grEK{@K z_77h`4deLvzR{%X*xhX$YR7_=kC%}Am_X{nK)32!w)=b=m1LL^pCodfp3El~B&&~G zT7eS40Ocde^vL<4xA@FdV1H`U3W=d_Y@?{;~sU%#)9Vx&8ckg_OYox=G0dz}p9o&Th^PbSi`2uw1|F z(Z^?2Qv#OnsRvp{t{|y46dK83q=WEX=IHFp!HN zWC-EbVvSaG9FY5bAqia(5YTfOI|ohRB=<7bL1jqAJTCK5_HlnhtxqHeRm_x8{2?(Y zcWIPMEtE}^M4QVP7~tiZGpDN!#>FB?YRrvAxFr;UX6F`$tE|(hqXgYEucGd*5{lIK zJdCi{m0eOt3!Od7Ba;2XG)4Z%X9W3nX7`E3BV3iUSma}lt@e@KC#B^`+fl>Ytpq(s zH$Wb?iVf!JT#LCwIBX)KYQ>v(L2Z@;zqT?y91cciJ z+dGk{n*lXVDH;0rB>BV4-LKvO?#tZrJU7p9w9jMo3<9+YwwPBxg|0Zg$0`o(edD&S z#OOE$K{__6uLB76bPIXEbq1gwK?>oYNbG@Co-P-xa==B|EWlh&b`GY~F+2BdkdMOG z_g|CXYP}wPdqRHVR#tU8pEWgU#8&S;SJA8-F6IQDc&TX-&M%?{D62IEf%bWEcgz`$B8u=}OMLTPDy?F*CI>x++YOj5Y9UwuwiPIYFM z?RiOAC3<3K^{wPY4NkN)^z`QW!W2|rz{&?H_Pvv9H~35Kvl-r0;@=_JDJF% zBlWiP^BL|-_5CX$Q>5{4Na1@!poSrGlKd`X_dB13krbWA2JJkrXH6YOP3;Ef2l_WA z2Jm*jw!JzC{FO1h-J{yZ)pds?zYgr)3tYInnXuvIT{5w+*3aCXt6s?#f=k>M>_rp9 zBXBEoB^;j@6iA)#*Xk@*X-tf1QSvIde{8-uf~<)z*w)lvZ%^`#xqi!Tn%QY=SIY*! z{3f(8uJSga$(Ez4s9xhdO;;NeL)+Cw+w-uYnU_zWQataac!2SFmZLVyQ|BB%^DF4lmdV0JnZ#q5!R9>k)mdIO+uAjWO3t!#py$XF zPWwz`=Z6xQB>8wBiNy12RH?ki!MD1Y9JRbQV(o4+G~lp_A%8M44_D$EpF+qi>0(#y zLcaC8W=y6?rSgE^LAeH{{M_#DbW80^ala)$M`dkoq>mcfNFk`6$zhgy{G8UwFMpnn zVJhl_O%FeHQNFLL_bO?aZ3q-hq`j6}-<>=D_SR{P?Y$u)v%V$T_d2bzd^iSsSL>b2 zhY#te?g~e#`LNx^+A|jfm-+cO*d6f7L%~N$Z%5D0PGkK{5g;@}>Z)OtHNmfWHrjU9 zEhR#Z{7GxxPHJ}D`q3>W(msz+Ai!Hc_>lj4Vg&s#I|xyg)^aKnd3TyQj46M9ellvd zA@{-u;_B)YSW!8S#L9w}D&l|Jr&=Hv9~y>f-(h-gGZxElS9jBSz)d$i5Ct}}bEu^A ze9ei3hBm*0DOQ4>s;azi%;L-=ki* z4!a;bGrJ6eUSrLNWB_T}Zt zF+PF*kB){MOiXn_Szgd%Q&))T2T4l@#RVeo&QO-nl&zdiS6ETt_JUL;ns8gWDrZ=KvOAoJMyu*qq^+G10;hF8MG$gUF(AB{iyfQT!GBysQTWH!Vy zJi!O#<@+$81uK#L)*nHR0I#&qY%fN#7_XxU7|&=vk@9YH53bOPLqbGBA~rI#{RZ2T zBPVa&XU7BkQqK5Yw*urTy~>~X-$+x6Gud&%ICc|M=b$4zDG^niYcsu zu@)ZWW@Jm$UYM<=A9a_y*H8qvr&^4;AkR3LYis!5Umn_av8QIQ?O@6c2Bq;(($+0A z)Qy(XnULvi5N3FOohx$%!ZSxWI0Tf}&prqh$sxaZrh5t2f?}GfBJDSQ$@Gu#R*pKeD?S=dXrtg-_QHwL&u26K4lqc zV-ttMsaBfw1JZvj=+iZJQcL?KJP{iuM*j4u$3bsvAbSJ`%Q9y@K?E?Y&HggPPyvPu43kN2Tt6ISz<@s>V9@! zd$<)F%voxHMbwEGS@uFA}sIA!--dPqAAA1J_*djTzKQ+hG z)IoGUV(0r~i=t#l%E5OOfo~KD)q#%{Yj4vH-?a#0bg+Y3hAQ=)UvkRGzyr-p%kt1h z(DQ1=z8nGXMRG?I-XdGUu(ts$fx*V>Sp0}B(F!X9s!C_kGBTg}bj}gB0s|B^2fI=2 z5bygjM=w)~g<$F^U3$LVm2-cMYgbyBjd90D>OaR{jFM+u9b*GF754z09#GT!~ z6N6_)+w1tR+*M9=oy)5xnpN8W;-1h<$ MWz}SAo|y*!FL*hZqyPW_ diff --git a/iso_configs/calamares_settings/dev/branding/peppermint/s5.png b/iso_configs/calamares_settings/dev/branding/peppermint/s5.png deleted file mode 100644 index a41da77911d98009fdc59dca1053c84b2440af5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55094 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 diff --git a/iso_configs/calamares_settings/dev/branding/peppermint/show.qml b/iso_configs/calamares_settings/dev/branding/peppermint/show.qml deleted file mode 100644 index c10e1243..00000000 --- a/iso_configs/calamares_settings/dev/branding/peppermint/show.qml +++ /dev/null @@ -1,40 +0,0 @@ -/* === This file is part of Calamares - === - * - * Copyright 2015, Teo Mrnjavac - * Copyright 2018-2019, Jonathan Carter - * - * Calamares is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, or (at your option) any later version. - * - * Calamares is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Calamares. If not, see . - */ - -import QtQuick 2.0; -import calamares.slideshow 1.0; - -Presentation -{ - id: presentation - Timer { - interval: 20000 - running: true - repeat: true - onTriggered: presentation.goToNextSlide() - } - Slide { - Image { - id: background5 - source: "s5.png" - width: 2000; height: 2000 - fillMode: Image.PreserveAspectFit - anchors.centerIn: parent - } - } -} diff --git a/iso_configs/calamares_settings/dev/branding/peppermint/stylesheet.qss b/iso_configs/calamares_settings/dev/branding/peppermint/stylesheet.qss deleted file mode 100644 index d33f5e1d..00000000 --- a/iso_configs/calamares_settings/dev/branding/peppermint/stylesheet.qss +++ /dev/null @@ -1,163 +0,0 @@ -/*########Current Calamares Styles##########*/ -/* These "Q's" are master styles for overall colours */ -#mainApp {background-color: #C0C0C0; - font-family: Cantarell; - font-weight: bold; - color: #000000 - } - -/* Set the entire Font and Background color */ -QWidget { color: #000000 ; - background-color: #C0C0C0; - font-family: Cantarell; - font: 14px; } - -#globalStorageTab { background-color: #C0C0C0 } - -/* Set Drop Down Font and Background color */ -QComboBox { font: 14px ; - color: #000000 ; - background-color: #ffffff ; - padding: 2px ; - border-radius: 10px - } - -#languageWidget { font: 14px ; - color: #111111 ; - background-color: #ffffff ; - text-align: center ; - border-radius: 6px - } - -/* Set the inline Text box edit Font and Background color */ -QLineEdit { font: 14px; - color: #111111; - background-color: #ffffff; - border-color: #000000 - } - -/* Set List box Font and Background color */ -QListView { font: 14px; - color: #000000; - background-color: #ffffff; - alternate-background-color: #C0C0C0; - padding: 2px; - border-radius: 4px - } - -#layoutSelector {} - -/* Set the TreeView Font and Background color */ -QTreeView { color: #000000; - background-color: #ffffff; - border-radius: 14px - } - -/* Set buttons Font and Background color */ -QPushButton { font: 14px; - color: #000000; - background-color: #C0C0C0; - border-color: #000000; - border-width: 10px;} - -#view-button-back { font: 14px; - background-color: #C0C0C0 - } -#view-button-back:hover { font: 14px; - color: #000000; - background-color: #ffffff; - border-color: #000000 - } -#view-button-next { font: 14px; - background-color: #C0C0C0; - border-color: #000000 - } -#view-button-next:hover { font: 14px; - color: #000000; - background-color: #ffffff; - border-color: #000000 - } -#view-button-cancel { font: 14px; - background-color: #C0C0C0; - border-color: #000000 - } -#view-button-cancel:hover { font: 14px; - color: #000000; - background-color: #ffffff; - border-color: #000000; - } -#view-button-install { font: 14px; - color: #C0C0C0; - border-color: #000000 - } -#view-button-done { font: 14px; - color: #000000; - border-color: #000000 - } - -/* Set the color in the keyboard selection */ -#layoutSelector { selection-background-color: #F62817 } -#variantSelector { selection-background-color: #F62817 } - -/* Set the CheckBox size and Background color */ -QCheckBox { color: #000000; - background-color: #C0C0C0; - border-width: 2px; - border-color: #000000 - } - -m_encryptCheckBox { font: 14px; - color: #F62817; - background-color: #C0C0C0; - border-radius: 4px; - padding: 6px - } - -checkBoxDoAutoLogin { font: 14px; - color: #000000; - background-color: #C0C0C0; - padding: 4px - } - -restartCheckBox { font: 14px; - color: #000000; - background-color: #C0C0C0; - border-color: #000000; - border-radius: 8px; - height: 16px; - width: 100px; - padding: 4px - } - -#QCheckBox#restartCheckBox::indicator:checked { image: url(/usr/share/pixmaps/ckm.png) } - -/* Set the color when selected */ -QRadioButton { color: #000000; - background-color: #C0C0C0; - padding: 4px; - border-radius: 4px - } -QComboBoxPrivateContainer { background-color: #ffffff } -QComboBoxListView { background-color: #ffffff } -qt_scrollarea_hcontainer { background-color: #ffffff } -qt_scrollarea_vcontainer { background-color: #ffffff } -QRadioButton::indicator { width: 18px ; height: 18px } -QRadioButton::indicator::checked { image: url(/usr/share/pixmaps/peppermint.png) } -QRadioButton::indicator::checked:hover { image: url(/usr/share/pixmaps/peppermint-fm-20.png) } -QRadioButton::indicator::unchecked:hover { image: url(/usr/share/pixmaps/peppermint-inst.png) } - -/* Set the tip Font and Background color */ -QToolTip { font: 14px; - color: #000000; - background-color: #ffffff; - padding: 4px; - border-radius: 4px - } - -/* Set the Progress Bar alignment and load color */ -QProgressBar { text-align: center } -QProgressBar::chunk { background-color: #F62817 } - -#debugButton {font: } -#sidebarMenuApp{ background-color: #C0C0C0 } -#tabWidget { background-color: #C0C0C0 } diff --git a/iso_configs/calamares_settings/dev/branding/peppermint/welcome.png b/iso_configs/calamares_settings/dev/branding/peppermint/welcome.png deleted file mode 100644 index 0ac6d64574b95a740614f949fa7ac65567f99d4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11204 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

E16ZczNB=A;8@m+$#$MG(FJ8 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 P?+>7%xj}{A $DESKTOP/calamares-install-peppermint.desktop - echo "Type=Link" >> $DESKTOP/calamares-install-peppermint.desktop - echo "Name=Install Debian" >> $DESKTOP/calamares-install-peppermint.desktop - echo "Icon=install-debian" >> $DESKTOP/calamares-install-peppermint.desktop - echo "URL=/usr/share/applications/calamares-install-peppermint.desktop" \ - >> $DESKTOP/calamares-install-peppermint.desktop -else - cp /usr/share/applications/calamares-install-peppermint.desktop $DESKTOP - # Xfce needs this executable otherwise it complains, everything - # else doesn't seem to care either way. - chmod +x $DESKTOP/calamares-install-peppermint.desktop -fi - -# Set desktop launcher as trusted under gnome/xfce (See: #1037299) - gio set --type=string ~/Desktop/calamares-install-peppermint.desktop \ - metadata::trusted true - gio set --type=string ~/Desktop/calamares-install-peppermint.desktop \ - metadata::xfce-exe-checksum \ - "$(sha256sum ~/Desktop/calamares-install-peppermint.desktop | cut -f1 -d' ')" - touch ~/Desktop/calamares-install-peppermint.desktop diff --git a/iso_configs/calamares_settings/dev/scripts/bootloader-config b/iso_configs/calamares_settings/dev/scripts/bootloader-config deleted file mode 100755 index 8ef0da74..00000000 --- a/iso_configs/calamares_settings/dev/scripts/bootloader-config +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") - -# Install luks utilities if needed. -# Also, set secure permissions for the initramfs if we're configuring -# full-disk-encryption. The initramfs is re-generated later in the -# installation process so we only set the permissions snippet without -# regenerating the initramfs right now: -if [ "$(mount | grep $CHROOT" " | cut -c -16)" = "/dev/mapper/luks" ]; then - echo "UMASK=0077" > $CHROOT/etc/initramfs-tools/conf.d/initramfs-permissions - chroot $CHROOT apt-get -y install cryptsetup-initramfs cryptsetup keyutils -fi - -chroot $CHROOT apt-get update - -echo "Running bootloader-config..." - -# Detect architecture and install the appropriate GRUB package -ARCH=$(uname -m) -case "$ARCH" in - x86_64) - if [ -d /sys/firmware/efi/efivars ]; then - echo " * Installing grub-efi (uefi)..." - DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-amd64 - else - echo " * Installing grub-pc (bios)..." - DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc - fi - ;; - i686) - echo " * Installing grub-efi-ia32 (uefi 32-bit)..." - DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-ia32 - ;; - aarch64) - echo " * Installing grub-efi-arm64 (uefi arm64)..." - DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-arm64 - ;; - *) - echo "Unsupported architecture: $ARCH" - exit 1 - ;; -esac - -# Re-enable os-prober: -sed -i "s/#GRUB_DISABLE_OS_PROBER=false/# OS_PROBER re-enabled by Debian Calamares installation:\nGRUB_DISABLE_OS_PROBER=false/g" $CHROOT/etc/default/grub -chroot $CHROOT /usr/sbin/update-grub - diff --git a/iso_configs/calamares_settings/dev/scripts/grub-defaults b/iso_configs/calamares_settings/dev/scripts/grub-defaults deleted file mode 100755 index 35bd4cad..00000000 --- a/iso_configs/calamares_settings/dev/scripts/grub-defaults +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash - -# SPDX-License-Identifier: GPL-3.0-or-later -# -# SPDX-FileCopyrightText: 2023 PeppermintOS Team (peppermintosteam@proton.me) - -# This script configures grub defaults after Debian installation. - -# Define CHROOT - CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") - -# Sets GRUB configuration. -# Writes the configuration to the /etc/default/grub file. -# Updates the bootloader. - -# Check if CHROOT is set -if [ -z "$CHROOT" ]; then - echo "CHROOT not set. Exiting." - exit 1 -fi - -# Defines the variables -GRUB_DEFAULT=0 -GRUB_TIMEOUT=5 -GRUB_DISTRIBUTOR="Peppermint" -GRUB_CMDLINE_LINUX_DEFAULT="quiet splash" -GRUB_CMDLINE_LINUX="" -GRUB_GFXMODE=1360x768 -GRUB_THEME="/boot/grub/themes/peppermint/theme.txt" -GRUB_DISABLE_OS_PROBER=false - -# GRUB configuration file path -GRUB_CONFIG_FILE="$CHROOT/etc/default/grub" - -# Modify the GRUB file -sed -i "s/^GRUB_DEFAULT=.*/GRUB_DEFAULT=$GRUB_DEFAULT/" $GRUB_CONFIG_FILE -sed -i "s/^GRUB_TIMEOUT=.*/GRUB_TIMEOUT=$GRUB_TIMEOUT/" $GRUB_CONFIG_FILE -sed -i "s/^GRUB_DISTRIBUTOR=.*/GRUB_DISTRIBUTOR=\"$GRUB_DISTRIBUTOR\"/" $GRUB_CONFIG_FILE -sed -i "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"$GRUB_CMDLINE_LINUX_DEFAULT\"/" $GRUB_CONFIG_FILE -sed -i "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"$GRUB_CMDLINE_LINUX\"/" $GRUB_CONFIG_FILE -sed -i "s/^#GRUB_GFXMODE=.*/GRUB_GFXMODE=$GRUB_GFXMODE/" $GRUB_CONFIG_FILE -# Add GRUB_THEME if it doesn't exist -if ! grep -q "^GRUB_THEME=" $GRUB_CONFIG_FILE; then - echo "GRUB_THEME=\"$GRUB_THEME\"" >> $GRUB_CONFIG_FILE -else - sed -i "s#^GRUB_THEME=.*#GRUB_THEME=\"$GRUB_THEME\"#" $GRUB_CONFIG_FILE -fi -sed -i "s/^#GRUB_DISABLE_OS_PROBER=.*/GRUB_DISABLE_OS_PROBER=$GRUB_DISABLE_OS_PROBER/" $GRUB_CONFIG_FILE - -# Run update-grub after modifying the file -chroot $CHROOT update-grub - - diff --git a/iso_configs/calamares_settings/dev/scripts/install-peppermint b/iso_configs/calamares_settings/dev/scripts/install-peppermint deleted file mode 100755 index a9a8190e..00000000 --- a/iso_configs/calamares_settings/dev/scripts/install-peppermint +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -### -# Wrapper for running calamares on Debian live media -### - -# Stale file left behind by live-build that messes with partitioning -sudo mv /etc/fstab /etc/fstab.orig.calamares - -# Allow Calamares to scale the window for hidpi displays -# This is fixed in the Calamares 3.3.0 series, so we can remove this -# once we switch to that -# Upstream commit that will make this obsolete: -# https://github.com/calamares/calamares/commit/e9f011b686a0982fb7828e8ac02a8e0784d3b11f -# Upstream bug: -# https://github.com/calamares/calamares/issues/1945 -# Debian bug: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=992162 -export QT_AUTO_SCREEN_SCALE_FACTOR=1 - -# Access control to run calamares as root for xwayland -xhost +si:localuser:root -pkexec calamares -d -xhost -si:localuser:root - -# Restore stale fstab, for what it's worth -sudo mv /etc/fstab.orig.calamares /etc/fstab diff --git a/iso_configs/calamares_settings/dev/scripts/update-system b/iso_configs/calamares_settings/dev/scripts/update-system deleted file mode 100755 index 98838b84..00000000 --- a/iso_configs/calamares_settings/dev/scripts/update-system +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -# Apply updates to the system - -# Function to update the system -function update_system() { - # Define CHROOT - CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") - - # Verifying CHROOT - if [ -z "$CHROOT" ]; then - echo "Error: CHROOT is not set." - exit 1 - fi - - echo "Updating the system..." - - # Update the package list - chroot $CHROOT /usr/bin/apt update - - # Update installed packages - chroot $CHROOT /usr/bin/apt upgrade -y - - # Remove unnecessary packages - chroot $CHROOT /usr/bin/apt autoremove -y - - # Clean the APT cache - chroot $CHROOT /usr/bin/apt clean - - echo "System successfully updated!" -} - -# Run the function to update the system -update_system - diff --git a/iso_configs/calamares_settings/devld/applications b/iso_configs/calamares_settings/devld/applications index 7ed1def2..3bcee520 120000 --- a/iso_configs/calamares_settings/devld/applications +++ b/iso_configs/calamares_settings/devld/applications @@ -1 +1 @@ -../dev/applications \ No newline at end of file +../deb/applications \ No newline at end of file diff --git a/iso_configs/calamares_settings/devld/branding b/iso_configs/calamares_settings/devld/branding index d7fd6649..fa31e26d 120000 --- a/iso_configs/calamares_settings/devld/branding +++ b/iso_configs/calamares_settings/devld/branding @@ -1 +1 @@ -../dev/branding \ No newline at end of file +../deb/branding \ No newline at end of file diff --git a/iso_configs/calamares_settings/devld/modules b/iso_configs/calamares_settings/devld/modules index c28e0081..240b0715 120000 --- a/iso_configs/calamares_settings/devld/modules +++ b/iso_configs/calamares_settings/devld/modules @@ -1 +1 @@ -../dev/modules \ No newline at end of file +../deb/modules \ No newline at end of file diff --git a/iso_configs/calamares_settings/devld/schemas b/iso_configs/calamares_settings/devld/schemas index 8a3b19a5..f0afabda 120000 --- a/iso_configs/calamares_settings/devld/schemas +++ b/iso_configs/calamares_settings/devld/schemas @@ -1 +1 @@ -../dev/schemas \ No newline at end of file +../deb/schemas \ No newline at end of file diff --git a/iso_configs/calamares_settings/devld/scripts b/iso_configs/calamares_settings/devld/scripts index 2c6e3204..1c90e6a9 120000 --- a/iso_configs/calamares_settings/devld/scripts +++ b/iso_configs/calamares_settings/devld/scripts @@ -1 +1 @@ -../dev/scripts \ No newline at end of file +../deb/scripts \ No newline at end of file