From 39448537db850fd7b8f509966e9fc3b9de7c46c3 Mon Sep 17 00:00:00 2001 From: bergware Date: Sun, 13 Jan 2019 13:25:52 +0100 Subject: [PATCH 1/7] Add log-size and log-file options to docker run command --- .../include/CreateDocker.php | 1 + .../include/Helpers.php | 30 +++++++++++++++---- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/plugins/dynamix.docker.manager/include/CreateDocker.php b/plugins/dynamix.docker.manager/include/CreateDocker.php index 69bbe8e86..11c027cd2 100644 --- a/plugins/dynamix.docker.manager/include/CreateDocker.php +++ b/plugins/dynamix.docker.manager/include/CreateDocker.php @@ -18,6 +18,7 @@ require_once "$docroot/plugins/dynamix.docker.manager/include/Helpers.php"; require_once "$docroot/webGui/include/Helpers.php"; $var = parse_ini_file('state/var.ini'); +$cfg = parse_ini_file('boot/config/docker.cfg'); ignore_user_abort(true); $DockerClient = new DockerClient(); diff --git a/plugins/dynamix.docker.manager/include/Helpers.php b/plugins/dynamix.docker.manager/include/Helpers.php index 40614fe7d..b0ec848c9 100644 --- a/plugins/dynamix.docker.manager/include/Helpers.php +++ b/plugins/dynamix.docker.manager/include/Helpers.php @@ -1,5 +1,17 @@ + Date: Sun, 13 Jan 2019 13:26:04 +0100 Subject: [PATCH 2/7] Fixed spelling --- plugins/dynamix/include/SystemInformation.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/dynamix/include/SystemInformation.php b/plugins/dynamix/include/SystemInformation.php index 83d8dd05d..edabb8294 100644 --- a/plugins/dynamix/include/SystemInformation.php +++ b/plugins/dynamix/include/SystemInformation.php @@ -84,11 +84,11 @@ echo $cpumodel.(strpos($cpumodel,'@')!==false ? "" : " @ {$cpu['Current Speed']}
HVM: '; if (strpos($strCPUInfo,'vmx')===false && strpos($strCPUInfo, 'svm')===false) { - // CPU doesn't support virtualzation + // CPU doesn't support virtualization echo "Not Available"; } else { - // Motherboard either doesn't support virtualzation or BIOS has it disabled + // Motherboard either doesn't support virtualization or BIOS has it disabled echo "Disabled"; } echo ''; @@ -118,7 +118,7 @@ if (!empty($iommu_groups)) { } else { echo ''; if (strpos($strCPUInfo,'vmx')===false && strpos($strCPUInfo, 'svm')===false) { - // CPU doesn't support virtualzation so iommu would be impossible + // CPU doesn't support virtualization so iommu would be impossible echo "Not Available"; } else { // Motherboard either doesn't support iommu or BIOS has it disabled From 8eaec3cbcdd6afc785c652e899c2742611527549 Mon Sep 17 00:00:00 2001 From: bergware Date: Sun, 13 Jan 2019 14:49:04 +0100 Subject: [PATCH 3/7] fixed javascript regressions --- plugins/dynamix.docker.manager/javascript/docker.js | 8 ++++---- plugins/dynamix.vm.manager/javascript/vmmanager.js | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/dynamix.docker.manager/javascript/docker.js b/plugins/dynamix.docker.manager/javascript/docker.js index 2768cbfe1..66de71725 100644 --- a/plugins/dynamix.docker.manager/javascript/docker.js +++ b/plugins/dynamix.docker.manager/javascript/docker.js @@ -162,22 +162,22 @@ function eventControl(params, spin) { } function startAll() { $('input[type=button]').prop('disabled',true); - for (var i=0,ct; ct=docker[i]; i++) if (ct.state==0) $('#'+ct.id).find('i').removeClass('fa-square').addClass('fa-refresh fa-spin'); + for (var i=0,ct; ct=docker[i]; i++) if (ct.state==0) $('#'+ct.id).parent().find('i').removeClass('fa-square').addClass('fa-refresh fa-spin'); $.post('/plugins/dynamix.docker.manager/include/ContainerManager.php',{action:'start'},function(){loadlist();}); } function stopAll() { $('input[type=button]').prop('disabled',true); - for (var i=0,ct; ct=docker[i]; i++) if (ct.state==1) $('#'+ct.id).find('i').removeClass('fa-play fa-pause').addClass('fa-refresh fa-spin'); + for (var i=0,ct; ct=docker[i]; i++) if (ct.state==1) $('#'+ct.id).parent().find('i').removeClass('fa-play fa-pause').addClass('fa-refresh fa-spin'); $.post('/plugins/dynamix.docker.manager/include/ContainerManager.php',{action:'stop'},function(){loadlist();}); } function pauseAll() { $('input[type=button]').prop('disabled',true); - for (var i=0,ct; ct=docker[i]; i++) if (ct.state==1 && ct.pause==0) $('#'+ct.id).find('i').removeClass('fa-play').addClass('fa-refresh fa-spin'); + for (var i=0,ct; ct=docker[i]; i++) if (ct.state==1 && ct.pause==0) $('#'+ct.id).parent().find('i').removeClass('fa-play').addClass('fa-refresh fa-spin'); $.post('/plugins/dynamix.docker.manager/include/ContainerManager.php',{action:'pause'},function(){loadlist();}); } function resumeAll() { $('input[type=button]').prop('disabled',true); - for (var i=0,ct; ct=docker[i]; i++) if (ct.state==1 && ct.pause==1) $('#'+ct.id).find('i').removeClass('fa-pause').addClass('fa-refresh fa-spin'); + for (var i=0,ct; ct=docker[i]; i++) if (ct.state==1 && ct.pause==1) $('#'+ct.id).parent().find('i').removeClass('fa-pause').addClass('fa-refresh fa-spin'); $.post('/plugins/dynamix.docker.manager/include/ContainerManager.php',{action:'unpause'},function(){loadlist();}); } function checkAll() { diff --git a/plugins/dynamix.vm.manager/javascript/vmmanager.js b/plugins/dynamix.vm.manager/javascript/vmmanager.js index a0cad9d2e..58fb2cc08 100644 --- a/plugins/dynamix.vm.manager/javascript/vmmanager.js +++ b/plugins/dynamix.vm.manager/javascript/vmmanager.js @@ -108,12 +108,12 @@ function addVMContext(name, uuid, template, state, vncurl, log){ } function startAll() { $('input[type=button]').prop('disabled',true); - for (var i=0,vm; vm=kvm[i]; i++) if (vm.state!='running') $('#vm-'+vm.id).find('i').removeClass('fa-square').addClass('fa-refresh fa-spin'); + for (var i=0,vm; vm=kvm[i]; i++) if (vm.state!='running') $('#vm-'+vm.id).parent().find('i').removeClass('fa-square').addClass('fa-refresh fa-spin'); $.post('/plugins/dynamix.vm.manager/include/VMManager.php',{action:'start'}, function(){loadlist();}); } function stopAll() { $('input[type=button]').prop('disabled',true); - for (var i=0,vm; vm=kvm[i]; i++) if (vm.state=='running') $('#vm-'+vm.id).find('i').removeClass('fa-play').addClass('fa-refresh fa-spin'); + for (var i=0,vm; vm=kvm[i]; i++) if (vm.state=='running') $('#vm-'+vm.id).parent().find('i').removeClass('fa-play').addClass('fa-refresh fa-spin'); $.post('/plugins/dynamix.vm.manager/include/VMManager.php',{action:'stop'}, function(){loadlist();}); } function vncOpen() { From d68bd13719103d70ae7e48131eeb7da24ba4c495 Mon Sep 17 00:00:00 2001 From: bergware Date: Sun, 13 Jan 2019 16:36:39 +0100 Subject: [PATCH 4/7] Added docker default settings --- plugins/dynamix.docker.manager/default.cfg | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 plugins/dynamix.docker.manager/default.cfg diff --git a/plugins/dynamix.docker.manager/default.cfg b/plugins/dynamix.docker.manager/default.cfg new file mode 100644 index 000000000..366233525 --- /dev/null +++ b/plugins/dynamix.docker.manager/default.cfg @@ -0,0 +1,7 @@ +DOCKER_ENABLED="no" +DOCKER_IMAGE_SIZE="20" +DOCKER_LOG_ROTATION="yes" +DOCKER_LOG_SIZE="50m" +DOCKER_LOG_FILES="1" +DOCKER_AUTHORING_MODE="no" +DOCKER_USER_NETWORKS="remove" From 578e7d25c6ca484ea803281cd2aa8496fe8d535c Mon Sep 17 00:00:00 2001 From: bergware Date: Sun, 13 Jan 2019 16:55:02 +0100 Subject: [PATCH 5/7] Added docker default settings --- plugins/dynamix.docker.manager/include/DockerClient.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/dynamix.docker.manager/include/DockerClient.php b/plugins/dynamix.docker.manager/include/DockerClient.php index b9dd92ed7..eb0c7d2f8 100644 --- a/plugins/dynamix.docker.manager/include/DockerClient.php +++ b/plugins/dynamix.docker.manager/include/DockerClient.php @@ -38,7 +38,8 @@ $driver = DockerUtil::driver(); // Docker configuration file - guaranteed to exist $docker_cfgfile = '/boot/config/docker.cfg'; -$dockercfg = parse_ini_file($docker_cfgfile); +$defaults = @parse_ini_file("$docroot/plugins/dynamix.docker.manager/default.cfg") ?: []; +$dockercfg = array_replace_recursive($defaults, parse_ini_file($docker_cfgfile)); function var_split($item, $i=0) { return explode(' ',$item)[$i]; From 26632428f75d4a7cb9fa2aba1b81961cd16680e9 Mon Sep 17 00:00:00 2001 From: bergware Date: Tue, 15 Jan 2019 20:06:26 +0100 Subject: [PATCH 6/7] Updated case models --- plugins/dynamix/include/SelectCase.php | 7 ++++--- plugins/dynamix/styles/default-cases.css | 5 ++++- plugins/dynamix/styles/font-cases.eot | Bin 14616 -> 18312 bytes plugins/dynamix/styles/font-cases.svg | 7 +++++-- plugins/dynamix/styles/font-cases.ttf | Bin 14432 -> 18128 bytes plugins/dynamix/styles/font-cases.woff | Bin 14508 -> 18204 bytes 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/plugins/dynamix/include/SelectCase.php b/plugins/dynamix/include/SelectCase.php index b3e361451..27b23a6a3 100644 --- a/plugins/dynamix/include/SelectCase.php +++ b/plugins/dynamix/include/SelectCase.php @@ -33,9 +33,10 @@ $casemodel = $exist ? file_get_contents("$boot/$file") : ''; "> "> diff --git a/plugins/dynamix/styles/default-cases.css b/plugins/dynamix/styles/default-cases.css index 044f70028..8a5a9dd40 100644 --- a/plugins/dynamix/styles/default-cases.css +++ b/plugins/dynamix/styles/default-cases.css @@ -1,6 +1,9 @@ @font-face{font-family:cases;font-weight:normal;font-style:normal; -src:url('font-cases.eot?20190111');src:url('font-cases.eot?20190111#iefix') format('embedded-opentype'),url('font-cases.ttf?20190111') format('truetype'),url('font-cases.woff?20190111') format('woff'),url('font-cases.svg?20190111#cases') format('svg')} +src:url('font-cases.eot?20190115');src:url('font-cases.eot?20190115#iefix') format('embedded-opentype'),url('font-cases.ttf?20190115') format('truetype'),url('font-cases.woff?20190115') format('woff'),url('font-cases.svg?20190115#cases') format('svg')} [class^='case-'],[class*=' case-']{font-family:cases!important;speak:none;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none} +.case-3u-md1510:before{content:'\e91a'} +.case-4u-storinator:before{content:'\e91b'} +.case-storinator-ws:before{content:'\e91c'} .case-full-tower:before{content:'\e914'} .case-htpc:before{content:'\e915'} .case-mid-tower:before{content:'\e916'} diff --git a/plugins/dynamix/styles/font-cases.eot b/plugins/dynamix/styles/font-cases.eot index d62729c7f7f9410b741f32b81f6eba984d904033..ffbef94df14fc0daea4f09936080181ad09806d5 100644 GIT binary patch delta 3971 zcmd5?cZtu=-L37rILUeU_V(_`->V62pj1snTNw!nTWQgu zHZ;%x76KMfAMyay#;Oz^kPHPWJQQ4tP>=$$5Im*|MJjp7!-*FHLd~fXQiPlfzuDb$ zoCFJ=BIf3sneWfceDi(Z&Np}Q3m0A^^}-X3U3+{*ttl^VOr%zt&ylzC^xlF3^kW93FRc;nQKKE`N?vB#9w3yaT>{`F%g7@PYl_hA*dyIXAeUv@LPP0$4MfO>CmVKTD>^p3Qz0SVRe!zane!_mr-ekXKe_(7h zKb#*O&JPP4P0{mh%d_kvx->?K2Z@2CP63XRZ6)G9A4^ZgJ#b$x)ayy)g*}=dO=IOL z2?f(Ea2-wQ&Q00gql(;e*Idi3b8}74WHy&F8M>kyhF%Jrl3@m> zf!1uSU*6cz*Ta&@lroufnamL$m7%z&Yu#l!)xAbe_a?Es%xpJJv)MG4&HJ$Bmm?I>yFiEFoSN zSQ=v+5%L843~RFw=vn$QtTlhG$c{6P*TPEm|Fxoff+T)lcYkA0p3;(S#q~{ zr*IE1@v!z;a+9j-6s#F??W*HDHP@>+ZY6Nss^dD{jb)TCp%=?2-TSfM(Nuc_|(b<5LiSSRgN+=}CA2yb_~dX$b( z-KpVoNx7*YIZj#99M!Hn)6mbA+hYR@fLR^@`={ZPnp2lZST$G?a*;0hj=GT zTGCE}SBIS3A<{Bd64Rx*U;yyk_>lOzV*?~p7Sx6Y(g2}xsx`k78o&#Zsc}lG7Q9<` zs<2;g>7D_kld7Qss-XdZV=*f{A$GH+t!xBD7@jhuq6n&ovEx@|&_tnTO~toXd`*Sn zoDZVtj*x9*(H4n>$mRNnhWa;~_~15kInmCAHxh=D3<5+zyeFBv^P^*p92YcQRdhu) zbS^k2E<|77+UV3s@#&IMI=wHsKUHWPH)qGnb4HLc=E?_-D??+(pk*qiH8_~vHCLWF zt{S@yaj;N)s{D!7rqX=<*~&9BSTkQAK?>=HDpW;j?k~>?KIZRHvxmk98+JlZ zbi3O$q(2kN0QJc(A)Bc5OG?lq={+*i6c5L$>^b%cJ2XmI6A@R62wezapog5KMjR0@ z1#u!(lWkZOHI#(#fE0x=P7y?Nz>0;UMM8GGA0|Xae4P}o?8+!&Af*a$1s7&AkuXB+ zH(NLToo1`HKSi0Ff`4O zmM_oMOOz0kHN?+>{p!I3raMfN+0c6O$O%nB#LOI;EBBeYzBi-pE@*p;bnBjCba3^p z+0oUFSw#Z8Cq2q#NWdD>;-R%d(*uz%BZ5EBD+Ww0NFNkp5E&3;NeIh5ABD3+|Am3_ z-`2+d_b+ZJ$}Sj=tD2=EG{do`Vtk^P`MQ@v*GTs~07zz?yEla?F0ui(i%sAGw9J0N z-eG@7pbpY7?yy(rHF}G#(%-nwlRU?R1IThseuAImr;zRD`SZNRU*hNZdHxOlZN?HZ zvw3(2;juyJG%v~}UX)q<@Y>MqFl(f3q@VwsBzDXZ!J|nMJLZVs(Ikl-b42iHlEjWV zBG^hm|3i`x+phQYR#r%=JJRK&2q5$5C*CVpye^hEFN)Ts?BrxNlgnis*+^vU|N64*UX09=pVcF~Ojf%$ zA0qMfg@ySGoldtcVSavL!Rd4;*XguE`@lxGGf^?O{wBl&{8b0L+u z$p#cq7`uMv#@BlN>g{Ts@~e)&q)VoR)gSwF#-7&rd%16gOXS~v-!E|dx&Ed_-s+Q$ INx;>A16mkMq5uE@ delta 278 zcmeC^XPi;QCSl3IkYF*9&5R{eEY^9VLl~pcM1T2-+e8Ho7#JA#0C7TcZeoFW*rf#% z@5t0|pIV*6z`$6+z+ki_BQ-Ha_|CUH1_l!upgOY*paA + + + \ No newline at end of file diff --git a/plugins/dynamix/styles/font-cases.ttf b/plugins/dynamix/styles/font-cases.ttf index 93736ea4d5c12d61d3df27a462dd4d01f10c42e5..8858c93c1c891e39be2d07376285ec86e434224c 100644 GIT binary patch delta 3965 zcmd5EfyIb3LwUhJS-R|8ff3HVWA}DIArj?P9u$87g zMA8@%z#w2N)CV3YTx(Sd4@iazDSapy%0rO?vJgC`3Pmb;=);K@0;kbn3%}W2 zJ5G}p@j%4fd^7X?nVE0D@0++21alsJe4#Qjrh1@U1}vRAyS$Qm z@~u}GqYUtq&n%x`L2m+=z5dLZuRs0DiFe|_R~dUqX`fzxYW%OCI>uP*o8Z^lAZWi6 ze*yk0;M4817goQ)#xTEi4fykC&YgN_`S;)d(_Y3t@i`EVon2mCVO{YU@O9wXXP3{O zzTy4$UErIH@qetGJAVO+qCC7I`Amo#FK!;C%uDoX%Dnyv{jrj=!B|q50F!CVU)RxIjsk?>5^1NY=QInNIVByz$Y&yA)8!%uIuUa)@nLUmvzI?i$PN~Ow*7}W8;m@O?@LM z>2xujUP-49@vsa>Jzed0d^*v;N>2Yev0KdSHchkHG&|-USf{ftiD;tE>~zd#R{|9= z_bS%dINt4cuNk`3LN|2Nkct@Q;^Ly-KB1fVHFQ~`t#>+~u?ZPAh>j(e!q{dW`y_js zb=mv$1bvOx=;!n%y+v=+E#BZK`B(W%{Ac_Mf1m$LsA5b^A<`pfjoMylZZBuqfY_)# zN>w-+K;E_wF$kPWww&g}$yVsGgEUj3LVnhsA}d4I6s2}*iQxBop+wp+X@w(HuO%h( z2+2hoRL1y_6afli9W@0(RIHOwu{@?0fKFjTP4XluFB!h%?5+V%?iTG7>`{%~t$v2e z3AOCxtvM>&uH!kia<$@=QC+9(xIxX!khPtB+0A<(0i+n}0Xj%dqMXS4mW}xsVmYUB zkPcAQNtRI)j#W-I$VSBy?ktW|z3kPks%FDFDW`&+sv6?EJnJ5&LsWNaI4;R@GBHUR z(j3*UJF`%)EVsw{766l~0PLTFPijuxsrZtJs=l z`p69o;KBgDw4*eD6?`Ffv!$_Y#6%FEGNi%~st3X2xiV_PP_t&DTPwPzf@6>iqx-J0 z=!#fOWU~Xq!vkAQoVTrPR&=v|a3x_Z>7YOc)Z3!jn?E_y$Z|omuA(cdp>x4GaUtUI z_3@dp!lOl{_}GJq`DDIv)LfV-wT!gUD(yR}3{MzCmZ_N5&`@TiRhm1h8hZ?}KVSGv z>G8Fu(tP=e%E>uJ_my0Ih%2}c1SzB&s!$cBIbUiCKH=?EGY2Mz8g@*N_4~Utq(2kN zAjM@DlTBC#c2o3isu0A3u_}9xZGsMsLgWKtAzR7_T?k>IhoGc}91*PrSt3=FZBP_7 zkc9A{6ooLpBAfzFBoh(>F6PVaARiX-ZS2pLk+dQPld1quaA785F(bf!vvbqmY!(|x z8I1-t?iyTz$6~iwZ+Ku}xN*GQHgDnm(C@X|$Ej^fqA3OXJ=q5MYpF4f^urHA2Ojf< z&|;zP@v->m)NnXWzP>h#a2j*jjsu=_7prL7ow0x;mFXD@) zYlxqH^XmS6<|s{P0^`X~j%f-4X6`_%6gPGKfwa0OuRTzp8#{`L80}wsuQcIfEv(07 zD8LHR(t(-eASl5Aen77nu(2S0NQfb%8$#HGMkl)Mn_za}w;(|N)7seo&czKy8G*&P zs#z*RG8k(r#>ciZUjI_y66ux?0g_nn)^%Zui+IM3uqn2mb=WW2o9yoh&>rYe~x1?9=?gZ8Dvudz@x{HQc6PAqG#;(b5`56!S3fQf1}@7%u+YI z*k7gf=i~aq)YO6=*XAZB=CrWgrhP@8;E%tqeR=%C^0D_dj{pDUx|a7(P=f3b-RAPH zx#PYr=N1-n5~f{uTEd6$%Q`jn{#E(VB}eaXl6>^8Yw@@SDCl?vN7aZPz}ru8Gpp<3 z($=CbI$IY-`%-3lI+M<3(~fK;GVy=EyDRp*^PE{`I>^d}C>8@w>fVzbj#J zacRlv^(foxwFA4rHXo$JV($Dehz9s;ApZ>0BUh4Bn_oXIp8?OnHJ>}^lJo&8R*MDF#Pm*=S}dy<`IUuNg=r}G?p7XMevti-Bo I=j!kM8*A%AnE(I) delta 306 zcmcc6%lM$6o`I2pfq|Q$fq|L9z&}{uh+l}!04TBth!c`?6AQ${E-heSV3Yy!L(&tA z3xKo$kPo6c(sL@)wok3j0rD#t7>t%=q$Z{a-}#ouz+eJWZMc& zODggh1QmdMpn8Uiocv_R#AQ2X7yt!600r!F6DtZB?lK25Fqi_x7!>jnb5q}$?tKH~ z2QV-&y(`EsE&)0e2rL{x@(j$(ZzmqGXOx`8=*=j(*@y9>kuu0XjK;>!v0|C={5D@1 zxLJS#3=B8o_Q%8M$qSs!8RaJ5aH^Ob<7~$P6b5OM+q}$KiAmguA&eoFp@^ZFA(J7W RArEMYA%h-+(d7HC9|65zN)`YB diff --git a/plugins/dynamix/styles/font-cases.woff b/plugins/dynamix/styles/font-cases.woff index 7d3713140caa950994d65237640202a1479c5997..dc305ba2439848e72a3165edcbd6e42a5f829644 100644 GIT binary patch delta 4013 zcmd5M zBuz>JJ&<4#>H`m@T(Bwy3B*B#6eJ3Pz7#1`5egD7sX~!TA1c-2g@7tzRYI!J#o;%* z_T`$C051{a`DW((Gc(_O^X+_}fA;M6U!?SNhYucP#84i|utC`$ybfHn&es#?w~qz> z@l#7@7^5aQ$0Velc=P3_m(EJsW#D=b%%@L&{CFPck@W(r$lS#f2#L&bU##gxsh4?cua8?>(Ea2-wY)(zR-p^EHE*IdnB z;^wNJPOmMe({x!k480gOMZ*kC1Fc!V^xBmx`lYa>)5Uc9Ogg=rM`gIz)AjBO9qC>t zr+b6gZDzI`rrBtiE9Qr=m6cUVMAPfcl@+tmmOw?!y^b|59cs7RZyUO91hUah13CZ} z78dm85#7YEuFKNfdc9+8T)GteWs#*Yw&5XQq7y+yZqogd?0 z=HKN%=hyiA{GUPoTQ7Ia4a`fCmR(jcr*B# zYOY_iDw+-Jq@1!_b}Aa&+nw?D&~Bj_*mQiCoQ^?!8*QXDW2(To8G8glrg#wur?#4XvFXvm;i6JJx;3#anXm6P=f+F( zMvykNssdcWg_(%Oj1c?H`b&SSQLH0k)az8gXK)cW7Q4+l!vh1u^+U~O zVBSWy(d{&whp1^vswpM99odHXE2&Y9^gUal0|!xyMY_jF<0F&9WofM~DRuJ}7)sGb zH(TlXlE4MUcxis;wwR%6#(+9#Xqq7{Uz)EKDJG_>@SpA5)E(PRcZ8-gq4ngEW10ew zncX>GikrIrP+Hxb*B&a+%{z+Gj@G`pRO`r`7GOaxeF0{WrVh;%+FV*I9N;3*D+X*V zNFNen2%(SQH<8ha?p#hdJG{8iL;j1k;W--?Hxy+PEXGyMQsI-~SW_`R&<}ati{YKf zd$|h`#X7fd2vb}@0=S7yBJ){czhZB&zrjO?XatYfS^5tBlCIHTxy}yXZSh(4gLaSF&WY-NPv)K5IU_A1(8Y=QvC3}(Cjc=q-?~UkB$!a z3l6~phz|D)4#5M64)+TV!2^g6_X`fQ2m@gV|Bul@wB8*^QP>7TW;y^F9LF#ii}D?R z8lh4EkkRzQMMBl06g5m;WxA?u;BCxQ`D@*kg)FtR3*BW}eLk+wO-|0~acy>dd{&Fv zJ}vl?{5b#3Tl@f?Vtlk=`N+5Ue|d`C+}vDF!j$JtNw^EYtW!hpUY9v6IePaB$$WNI z+aHf>T0CCRk>U2L(MxXoX*L+*;@W~PR@N?v=Ecm^R3@FxrXATxWc>g00qkCg?2((( zBZEwN-5d9i_@%|gg>Q8_-L`~yjyr$R^ o{L3DD^@o0prz-3Tc7lD8oyGsl)9e}iy>(fMRa)=XrU2Le1q(4s@Bjb+ delta 371 zcmbQ!$GE0YqTJujje(H?2rSkxaD(XtAfIV6qr1pN9pQR|{$i1~g-Zb=1D45*g@NHbLAF$gN;{wy{Km Date: Tue, 15 Jan 2019 21:42:51 +0100 Subject: [PATCH 7/7] Fixed share/disk size calculation when names include space --- plugins/dynamix/scripts/disk_size | 5 ++--- plugins/dynamix/scripts/share_size | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/plugins/dynamix/scripts/disk_size b/plugins/dynamix/scripts/disk_size index a6385dc01..598ac6273 100755 --- a/plugins/dynamix/scripts/disk_size +++ b/plugins/dynamix/scripts/disk_size @@ -22,9 +22,8 @@ function check { total=$(($total + $size)) fi } -shares=$(ls -vd /mnt/user/*) -for share in $shares; do +while IFS=$'\n' read -r share; do [[ -d $share ]] && check "$(basename "$share")" "$disk" -done +done <<< $(ls -vd /mnt/user/*) echo "share.total=$total" >>"$output" echo "total disk usage: $total" diff --git a/plugins/dynamix/scripts/share_size b/plugins/dynamix/scripts/share_size index ec524b2f7..54f6b139b 100755 --- a/plugins/dynamix/scripts/share_size +++ b/plugins/dynamix/scripts/share_size @@ -23,9 +23,8 @@ function check { } check "/mnt/cache" "$share" -disks=$(ls -vd /mnt/disk*) -for disk in $disks ; do +while IFS=$'\n' read -r disk; do check "$disk" "$share" -done +done <<< $(ls -vd /mnt/disk[0-9]*) echo "disk.total=$total" >>"$output" echo "total disk usage: $total"