From 2a39a453a3566caa2ebe91a7db1042fd6cfe5c5b Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Sat, 12 Mar 2016 17:04:52 +0300 Subject: [PATCH] More desktop stuff --- bin/xenial-desktop.tgz | Bin 0 -> 4010 bytes desktop.sh | 14 +++++++++++--- scripts/check_first_login.sh | 6 ++++-- 3 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 bin/xenial-desktop.tgz diff --git a/bin/xenial-desktop.tgz b/bin/xenial-desktop.tgz new file mode 100644 index 0000000000000000000000000000000000000000..87d8ed004e724cdf68009767b9b00a5b7b504ca9 GIT binary patch literal 4010 zcmb2|=3tm9{UnTm`E6`;{%s4fcbn^5Cq$mv*OTMDZ|m(ewoJX;3(I(mGSdwtB(}KR zo^xT5L*T~PH~sNJlX4@)RD(M2>bX5%xH5O%`v4npIk}*q&0mw=UwLMdvHfU#_J!NO zb}tg2c2_$FI*GL)MI)9T>^6%lV|I-)MJ-(A%@-zG~_Yy{> zdmFFjn7^B5XY;RPPx~=-gXZJuN0@oc{7(A#h#&9uZr`5W%9zUicca3R2Y6o>fmi_V?`Z$C}A?ALfT;+s!whJYU8r+fq2CZ-Tl7 zQ~SSXXYM>sOwg0*nbSUhxk|zX**>RZ9p*0YKEC`b|Nbq%`P_f<`Rwu1?-#IZ7A^XB zuWg^dhH=af4#SVG%cbvE@2I!9^`qV>rkaBx^?czg>a%zdw(PFhi4S z`H7j9tvBMWO~1c1T=;Me=Zl<{2K76;%J#}nnzc6j$%YAs{x1C=`sx3+*yr`^iW~pU zuAag0{dm;>uWzINw=YOr-Py_f!S1xfuV34D{aGFLpMAmBe~)GA^o_2(s*nD6U-rr` zdyc}tpLOzj)PAq~zvAWnZENR!_#d}D{PllhcB4-g`;^kMEJaard;&g313&*Y?f$U;Vf0|9gcgSNHF3zpF6! zPyU5>-9Pfnt+xK-cQpFze)Lb;g8+`b+cNiNm5Yb%zML849`APZPk!mH+rPH&T#{$| zU%u&IPkHITtN?eQl$GN#5eF{6CYo{(EUVQ&r>b)$;ql zZ)Itz>;8XV{{7Maw^#n@`!gi{e}DB~J;$opU-Nw<|9@{}pTApT&D8&&JLjvj{QdRk zdZNba|3@qAs^5h!i2HlJ?@RvmulJiTtowKL_;XW+zklcF?T%jmpWjL7Z#Vxk{*}h8 za`Oew9DTz%xoOt_i^I0-^MM^z54UN;)}ESG1bSCi(b7xk+rR#=Y{1F*LzQXy!iL-P)+5R z+v|Ie%|0T;<1fQ%J?ZA5i)L5W^B%5v9DGQ(Q&%{w{Y=_{;>uvPbJJxH&OARY@bukn zdNR!doA)f+-CKX`%~#Ged;c4+xwB_4U3w__dH2m!A+f_w_rGvBKVIq+lznum((cc) zDe=K3%q5ynmhUQJGfW96{86{R;-u5SzRLgfJV9XJ7Q?+oGXF1nI z%V!dmdP`>g3*JTIATg5kgH153|LIIb_GeLFp~e*dA1(O%CSXI?9t`{w4Zm=}H4L6f=` zG3afHK9tVab;tBVhrph;M3a`Ec{6@aVeFl@`S+YmJ==Ah%OqmAFkN@I2s^shaq`Nn z+tpVWXrF6+b$(HK!jkhMH(!hNu2#-C8`boFN=1**oL<|i>vQ-QE!?q|+ut#!nNub# z_<-wnCjb3R=NB-YKh0&cUh6}|TP>f^Np7dt<>^<>x^6OW3iHwf=WV~AlvwoR|DNf~ zgqMmaPHmp~$I3p2U;9O^xXW?AB?@z&GprO~D08ej&lse*=1o&bhw*L&QKs{H9<3fC zKMq_hRDPMVAobN{TS)cMH~HGPv`^4CjEQ&QGOIm}w0lyZLE)2Tm8{+OLz z{&-cUo$Py`&o3=fX89jyzg%OLw|!~(T$P0GjjN7&Olo|-PWp*dblP20^)HHCc8AY> zU<}*nq?r)TzagCK#%1O=)0w_~Wnf?0z-)V9`qBpduMF{1nf7V1--%tAdSTAe=7$A+ zHq*~AujMiS>CA7riuo8Gu{ zw6IZW%E6R-_O9#fW~i<<>v!&X{JHK`!X^jz#D;w9ZhOXGiOV-b)2;3-aP%2bxkUfLKF2p6&Gs6&(`t`I$?53e1q2{k)R2mLf1`N zGU?6|9WmSEK8n2WU&^g+sakp|wd|c*vB%fN)6Pg9@c6QG*QXRgo%l+w%;?Im4xT}t zcH#33WYLZsn8ah?G`0JFStLnSgGR3eN+=`U%iuKgxefBow>AEEvBJGJL zVIf>s_pe#cykx#l{`<%@=2fr5Hf(D;+st(N+fR;A)5%5Jfd-TA7%jZ>#)MH+z+2(_ zCiQdnc11qB>>61$SYOwEAJ==Wk6PcUqzphoWXUUxZ-^WX3 zX}eu;NYVf4S3Pb2Cti5=_Dx^v&96VtJ71W5u3l~1f`S*tEOXeWPdanXzs}NT=gWY# za(2pcNiAMc@3*-d+s&V4mk{h(;AeXwq@>Ep^MrF;%Ad7Q3fpp5|J-hW)8%cfrUc8G z9+%JwLO<_ymD;u|V}B+^v`XG}TD7R);sp`b#i5S{Ds%4s?u+$T z{;j9X7UNztw4(;l(I3KHwO#GlUm%y%qFe_a2RNVN>@9wMDC5a9KJ( ztEl!2Z>&vejmJ@2gPqS-9k5YeSCTy8|Gu5elh~ECM8jl^h1d%0S_Swu4_bWLI#ume z%A(&J&$99`&FQ-GDo;L~d-ajqGbW!Gitbxh!b7^yx{eQ#dhc9Vdnc;6 zYdUGXca}M%)~f75M+`c*pV&mxoN%zxeQaA@9}#UWGlO~brbRhhM3s_pTA$fJ8t z*k{QZj_~p?8AbA+4D3H1ITD(AuFLS4%c(lUHg1XyZdRInQn>ing~bX`q!_y z4r~Y#4N+x_p1yGL=?#(_Ck4N_$dM>kda z)!)prPELrA*D8H;B)KE~vBHVDw^Cx>SFR3G3ej-fvNzRRXLC&85|OL+lK;={-mZRY z@s~c^6+M?UKlttZ?f;1>kT4<_fEds^1tUz8uPR$u->(D|zO z6~7FaO1$N@cvk0WevEO{-y?GSTbB4oGp(vj1CBr28{DiebMRIvPkl5orebc<-xEtF z{@P*ZQIkFQjh*XvCg9pSt`|vRFC>kHPp|!8km*(b;_*LsZlEv zzfO%>x_Zmf{;;D0HcrNyuS$6NX}!3!O;FSGr9G!aB`nz<=eE48Nht5; z-lIG${1I=|#5PB7`dz{Nf|*NVVUT+p_q*>?Yc%%0;r{$R->d7T=lj&{*1u~6)$Ox| zKA+ONBe-#4OZcxXEvo;SP9(=~VLWtsD?_iDa)1Q)rtM~m$4zB>795}TFX)|F(c$%% z_csUK`yGGO{=BC0ssB&T|KGmm;JM%OR(F5>o8NrF|JYp-)?*QSSiAnu4L&0ArRU%Tm;~o$=)|6o~%TwnP7gc%fl*M|8qk(OEB;Bv@J6b<%RA=65(&sIN4PE7$Fa zU&4M@E&rathVNr>{Qm!M6|USlBVBFGSo`;O*#2+-n*)sJUHJa; fU+ACx$yeY1U%hhKtgKtwfBAQawM#H8U|;|M%+3Mk literal 0 HcmV?d00001 diff --git a/desktop.sh b/desktop.sh index c375898e0..229a1edb5 100644 --- a/desktop.sh +++ b/desktop.sh @@ -48,12 +48,20 @@ if [[ $RELEASE == "trusty" ]]; then chroot $DEST/cache/sdcard /bin/bash -c "tar xfz /tmp/trusty-desktop.tgz -C /root/" fi +# Ubuntu Xenial +if [[ $RELEASE == xenial ]]; then + # copy wallpapers and default desktop settings + d=$DEST/cache/sdcard/usr/share/backgrounds/xfce/ + test -d "$d" || mkdir -p "$d" && cp $SRC/lib/bin/armbian*.jpg "$d" + chroot $DEST/cache/sdcard /bin/bash -c "tar xfz /tmp/xenial-desktop.tgz -C /etc/skel/" + chroot $DEST/cache/sdcard /bin/bash -c "tar xfz /tmp/xenial-desktop.tgz -C /root/" + mkdir -p $DEST/cache/sdcard/etc/polkit-1/localauthority/50-local.d + cp $SRC/lib/config/polkit-jessie/*.pkla $DEST/cache/sdcard/etc/polkit-1/localauthority/50-local.d/ +fi + # Install custom icons and theme chroot $DEST/cache/sdcard /bin/bash -c "dpkg -i /tmp/vibrancy-colors_2.4-trusty-Noobslab.com_all.deb >/dev/null 2>&1" chroot $DEST/cache/sdcard /bin/bash -c "unzip -qq /tmp/NumixHolo.zip -d /usr/share/themes" -# cleanup -chroot $DEST/cache/sdcard /bin/bash -c "apt-get -y autoremove >/dev/null 2>&1" -chroot $DEST/cache/sdcard /bin/bash -c "apt-get clean >/dev/null 2>&1" # unmount bind mount umount $DEST/cache/sdcard/tmp >/dev/null 2>&1 diff --git a/scripts/check_first_login.sh b/scripts/check_first_login.sh index 65b69dc8f..b366e9f4d 100644 --- a/scripts/check_first_login.sh +++ b/scripts/check_first_login.sh @@ -31,10 +31,12 @@ if [ "$-" != "${-#*i}" ]; then if [ -f /etc/init.d/nodm ] ; then sed -i "s/NODM_USER=\(.*\)/NODM_USER=${RealUserName}/" /etc/default/nodm sed -i "s/NODM_ENABLED=\(.*\)/NODM_ENABLED=true/g" /etc/default/nodm - if [ "X${ConfigureDisplay}" = "Xn" -o "X${ConfigureDisplay}" = "XN" ]; then + if [[ -z $ConfigureDisplay || $ConfigureDisplay == n || $ConfigureDisplay == N ]]; then echo -e "\n\e[1m\e[39mNow starting desktop environment...\x1B[0m\n" sleep 3 - service nodm restart + service nodm stop + sleep 1 + service nodm start fi fi fi