From 0d880231ca057434bd9b06e4b74a7a72f269cb88 Mon Sep 17 00:00:00 2001 From: kyodev Date: Wed, 20 Jun 2018 14:44:45 +0200 Subject: [PATCH] maj --- docs/scripts/bench.md | 254 ++++++++++++++++------------------- docs/scripts/getInfo.md | 21 +-- docs/scripts/getInfo_plus.md | 8 +- docs/scripts/ipupdate.md | 9 +- docs/scripts/nstest.md | 41 +++--- scripts/getInfo | 104 +++++++------- 6 files changed, 216 insertions(+), 221 deletions(-) diff --git a/docs/scripts/bench.md b/docs/scripts/bench.md index 1c37d4d..e1287dd 100644 --- a/docs/scripts/bench.md +++ b/docs/scripts/bench.md @@ -6,196 +6,180 @@ | '_ \/ __| __/ _ \/ __| __| | | | \__ \ || __/\__ \ |_ |_| |_|___/\__\___||___/\__| --bench --noresolv - version: 1.6 02/06/2018 + version: 1.8.0 20/06/2018 -``` - -```text - IPV4 1:org 2:eu 3:fr 4:com 5:info 6:org 7:libre 8:net 9:io 10:sh Average - cloudflare (1.1.1.1) 9 18 9 9 31 9 -9 9 22 10 13.50 ms - google (8.8.8.8) 13 13 8 15 24 13 -15 8 44 13 16.60 ms - neustar (156.154.70.1) 17 17 17 18 17 17 -17 17 17 24 17.80 ms - norton (199.85.126.10) 17 17 17 17 17 19 17 17 17 18 17.30 ms - level3 (209.244.0.3) 68 29 16 15 163 16 68 22 24 24 44.50 ms - verisign (64.6.64.6) 18 23 18 17 151 24 -17 176 27 26 49.70 ms - quad9 (9.9.9.9) 24 31 37 23 39 25 -23 27 32 261 52.20 ms - opendns (208.67.222.222) 24 23 15 25 395 15 -16 19 25 17 57.40 ms - dns_watch (84.200.69.80) 12 24 27 11 496 19 -12 19 26 19 66.50 ms - freedns (37.235.1.174) 32 48 30 30 298 45 -30 52 52 45 66.20 ms - freenom (80.80.80.80) 26 181 37 27 138 25 -31 30 27 342 86.40 ms - adguard (176.103.130.130) 97 113 92 58 125 115 -106 121 132 107 106.60 ms - comodo (8.26.56.26) 57 453 23 27 268 58 -34 48 80 59 110.70 ms - yandex (77.88.8.8) 86 89 52 51 110 51 -229 89 83 269 110.90 ms - cleanbrowsing (185.228.168.168) 95 171 83 85 99 100 -89 157 99 242 122.00 ms - dyn_oracle (216.146.35.35) 190 165 87 109 172 163 -85 156 175 87 138.90 ms - alternate_dns (23.253.163.53) 100 198 97 97 954 100 -98 299 102 104 214.90 ms - uncensoredDNS (91.239.100.100) 54 43 28 28 73 827 -28 53 826 405 236.50 ms + IPV4 1:org 2:eu 3:fr 4:com 5:info 6:org 7:libre 8:net 9:io 10:sh Average + cloudflare (1.1.1.1) 10 21 10 10 45 10 -10 10 25 18 16.90 ms + google (8.8.8.8) 14 35 9 14 14 9 -15 14 39 13 17.60 ms + level3 (209.244.0.3) 16 23 16 15 164 17 16 25 24 22 33.80 ms + freedns (37.235.1.174) 38 50 30 31 n/a 44 -32 53 46 31 39.44 ms + opendns (208.67.222.222) 16 17 16 24 252 16 -16 28 18 18 42.10 ms + verisign (64.6.64.6) 57 250 19 17 26 20 -25 163 24 157 75.80 ms + norton (199.85.126.10) 19 185 19 17 483 30 18 19 19 19 82.80 ms + dns_watch (84.200.69.80) 31 53 49 29 516 37 -29 38 42 37 86.10 ms + adguard (176.103.130.130) 67 106 106 64 122 65 -67 120 111 123 95.10 ms + yandex (77.88.8.8) 100 124 102 56 115 83 -166 95 89 89 101.90 ms + neustar (156.154.70.1) 18 446 18 18 476 22 -20 18 159 18 121.30 ms + comodo (8.26.56.26) 63 440 48 20 278 70 -29 117 185 21 127.10 ms + quad9 (9.9.9.9) 17 80 30 16 994 16 -18 23 151 16 136.10 ms + freenom (80.80.80.80) 25 57 35 23 779 25 -24 61 326 32 138.70 ms + uncensoredDNS (91.239.100.100) 44 98 59 33 n/a 52 -33 66 268 873 169.55 ms + cleanbrowsing (185.228.168.168) n/a 604 172 86 233 89 -121 179 99 112 188.33 ms + dyn_oracle (216.146.35.35) 176 171 90 88 307 n/a -95 547 242 191 211.88 ms + alternate_dns (23.253.163.53) 110 131 99 99 926 101 -102 204 280 101 215.30 ms tested domains ('base' list): 1:debian.org 2:eurid.eu 3:free.fr 4:google.com 5:info.info 6:kernel.org 7:be.libre 8:ovh.net 9:packager.io 10:transfer.sh n/a indicates an inaccessible server, dash (-) indicates a domain not found - execution time: 19 s (02/06/2018 15:36 +0200) -``` + execution time: 26 s (20/06/2018 12:51 +0200) -```text IPV6 1:org 2:eu 3:fr 4:com 5:info 6:org 7:libre 8:net 9:io 10:sh Average - cloudflare (2606:4700:4700::1001) 10 9 9 9 9 10 -9 9 9 9 9.20 ms - verisign (2620:74:1b::1:1) 16 16 27 18 18 18 -17 19 17 17 18.30 ms - google (2001:4860:4860::8888) 14 14 13 15 25 21 -13 14 41 32 20.20 ms - dns_watch (2001:1608:10:25::1c04:b12f) n/a 22 22 22 22 22 n/a 22 22 n/a 22.00 ms - neustar (2610:a1:1018::1) 26 24 23 24 23 23 22 23 23 23 23.40 ms - uncensoredDNS (2001:67c:28a4::) 39 40 39 39 40 40 -39 40 39 39 39.40 ms - yandex (2a02:6b8::feed:0ff) 85 122 94 52 237 202 -50 93 110 78 112.30 ms - quad9 (2620:fe::fe) 32 34 15 15 924 17 -17 19 25 276 137.40 ms - adguard (2a00:5a60::ad1:0ff) 218 572 85 89 685 221 -204 310 396 206 298.60 ms + cloudflare (2606:4700:4700::1001) 10 10 10 10 10 10 -10 10 10 10 10.00 ms + verisign (2620:74:1b::1:1) 20 17 18 18 17 20 -20 17 18 18 18.30 ms + google (2001:4860:4860::8888) 15 29 14 16 36 21 -15 14 28 23 21.10 ms + dns_watch (2001:1608:10:25::1c04:b12f) 22 25 n/a 22 22 n/a -23 22 22 22 22.50 ms + uncensoredDNS (2001:67c:28a4::) 40 40 40 40 40 40 -40 40 40 40 40.00 ms + quad9 (2620:fe::fe) 17 50 31 16 254 17 -19 21 19 20 46.40 ms + neustar (2610:a1:1018::1) 44 448 23 22 488 23 26 22 45 24 116.50 ms + yandex (2a02:6b8::feed:0ff) 86 61 99 51 603 80 -163 88 244 244 171.90 ms + adguard (2a00:5a60::ad1:0ff) 212 389 235 88 578 208 -216 313 265 237 274.10 ms tested domains ('base' list): 1:debian.org 2:eurid.eu 3:free.fr 4:google.com 5:info.info 6:kernel.org 7:be.libre 8:ovh.net 9:packager.io 10:transfer.sh n/a indicates an inaccessible server, dash (-) indicates a domain not found - execution time: 31 s (02/06/2018 15:36 +0200) -``` + execution time: 37 s (20/06/2018 12:51 +0200) -```text IPV4 1:org 2:eu 3:fr 4:com 5:info 6:org 7:libre 8:net 9:io 10:sh Average - cloudflare (1.1.1.1) 9 9 9 9 9 9 -9 9 9 9 9.00 ms - dns_watch (84.200.69.80) 11 11 11 11 11 11 -11 11 11 11 11.00 ms - google (8.8.8.8) 13 13 8 13 20 8 -14 17 36 9 15.10 ms - verisign (64.6.64.6) 15 15 16 16 16 16 -16 16 17 16 15.90 ms - neustar (156.154.70.1) 17 18 17 17 17 17 -17 17 17 17 17.10 ms - norton (199.85.126.10) 18 18 18 17 17 17 17 18 18 17 17.50 ms - opendns (208.67.222.222) 17 23 16 22 25 15 -15 20 26 17 19.60 ms - uncensoredDNS (91.239.100.100) 28 28 29 28 29 29 -28 29 29 29 28.60 ms - freenom (80.80.80.80) 25 60 38 23 25 28 -24 29 43 32 32.70 ms - level3 (209.244.0.3) 38 14 14 17 278 16 15 25 15 15 44.70 ms - quad9 (9.9.9.9) 40 50 38 23 23 23 -23 38 23 260 54.10 ms - freedns (37.235.1.174) 31 48 30 30 210 30 -30 53 57 45 56.40 ms - comodo (8.26.56.26) 21 24 24 21 320 55 -21 21 46 21 57.40 ms - adguard (176.103.130.130) 55 52 55 54 60 71 -58 54 102 98 65.90 ms - cleanbrowsing (185.228.168.168) 85 98 83 85 87 96 -85 87 92 87 88.50 ms - alternate_dns (23.253.163.53) 98 97 97 98 97 98 -97 98 101 98 97.90 ms - yandex (77.88.8.8) 116 89 130 51 268 82 n/a 89 113 122 117.77 ms - dyn_oracle (216.146.35.35) 180 167 87 98 343 95 -86 88 102 100 134.60 ms + cloudflare (1.1.1.1) 10 9 10 10 10 10 -10 9 18 10 10.60 ms + google (8.8.8.8) 9 14 14 17 14 9 -14 14 39 14 15.80 ms + neustar (156.154.70.1) 18 18 18 18 18 18 -18 18 18 18 18.00 ms + verisign (64.6.64.6) 18 36 17 17 19 17 -16 17 17 17 19.10 ms + level3 (209.244.0.3) 64 16 16 17 16 15 16 16 33 26 23.50 ms + norton (199.85.126.10) 18 19 18 18 19 18 18 22 118 18 28.60 ms + dns_watch (84.200.69.80) 29 29 29 29 29 29 -28 38 35 29 30.40 ms + uncensoredDNS (91.239.100.100) 33 34 33 34 33 34 -33 34 34 33 33.50 ms + opendns (208.67.222.222) 18 17 16 16 244 16 -16 28 18 16 40.50 ms + comodo (8.26.56.26) 63 21 21 21 20 37 -31 151 215 37 61.70 ms + adguard (176.103.130.130) 64 63 64 64 65 63 -63 66 129 64 70.50 ms + freedns (37.235.1.174) 34 33 32 31 319 31 -172 53 152 47 90.40 ms + quad9 (9.9.9.9) 16 43 30 15 406 18 -17 21 378 18 96.20 ms + cleanbrowsing (185.228.168.168) 87 86 83 83 86 92 -86 186 112 84 98.50 ms + freenom (80.80.80.80) 25 25 40 23 785 25 -25 28 25 32 103.30 ms + alternate_dns (23.253.163.53) 98 99 98 99 99 99 -98 201 153 98 114.20 ms + yandex (77.88.8.8) 191 65 100 56 319 54 -61 95 54 175 117.00 ms + dyn_oracle (216.146.35.35) 202 86 86 93 91 89 -94 165 201 219 132.60 ms tested domains ('alt' list): 1:debian.org 2:eurid.eu 3:free.fr 4:google.com 5:info.info 6:kernel.org 7:be.libre 8:ovh.net 9:packager.io 10:transfer.sh n/a indicates an inaccessible server, dash (-) indicates a domain not found - execution time: 13 s (02/06/2018 15:37 +0200) -``` + execution time: 15 s (20/06/2018 12:51 +0200) -```text IPV6 1:org 2:eu 3:fr 4:com 5:info 6:org 7:libre 8:net 9:io 10:sh Average - cloudflare (2606:4700:4700::1001) 9 9 9 9 9 9 -9 9 26 9 10.70 ms - quad9 (2620:fe::fe) 16 24 30 15 34 15 -16 16 15 15 19.60 ms - google (2001:4860:4860::8888) 14 13 13 14 35 21 -14 14 44 22 20.40 ms - neustar (2610:a1:1018::1) 23 23 24 23 23 26 24 22 24 26 23.80 ms - dns_watch (2001:1608:10:25::1c04:b12f) 22 22 22 22 n/a 22 -22 31 45 22 25.55 ms - verisign (2620:74:1b::1:1) 17 17 17 18 19 18 -19 178 27 17 34.70 ms - uncensoredDNS (2001:67c:28a4::) 39 39 39 39 40 39 -39 64 56 39 43.30 ms - adguard (2a00:5a60::ad1:0ff) 85 83 83 87 91 88 -83 89 91 85 86.50 ms - yandex (2a02:6b8::feed:0ff) 300 121 52 50 264 85 -54 50 109 264 134.90 ms + cloudflare (2606:4700:4700::1001) 10 10 10 10 14 11 -12 12 11 13 11.30 ms + google (2001:4860:4860::8888) 14 15 14 15 14 22 -14 18 35 14 17.50 ms + dns_watch (2001:1608:10:25::1c04:b12f) 22 22 23 22 22 22 -22 22 22 22 22.10 ms + neustar (2610:a1:1018::1) 23 24 24 23 24 24 24 23 23 23 23.50 ms + verisign (2620:74:1b::1:1) 17 18 19 18 17 18 -17 158 26 17 32.50 ms + quad9 (2620:fe::fe) 16 63 16 16 41 17 -16 17 247 19 46.80 ms + uncensoredDNS (2001:67c:28a4::) 40 40 40 40 40 40 -40 73 209 40 60.20 ms + yandex (2a02:6b8::feed:0ff) 60 92 101 49 53 88 -55 96 81 83 75.80 ms + adguard (2a00:5a60::ad1:0ff) 100 89 86 86 84 90 -88 90 88 90 89.10 ms tested domains ('alt' list): 1:debian.org 2:eurid.eu 3:free.fr 4:google.com 5:info.info 6:kernel.org 7:be.libre 8:ovh.net 9:packager.io 10:transfer.sh n/a indicates an inaccessible server, dash (-) indicates a domain not found - execution time: 20 s (02/06/2018 15:37 +0200) -``` + execution time: 20 s (20/06/2018 12:52 +0200) -```text IPV4 1:org 2:eu 3:fr 4:com 5:info 6:org 7:libre 8:net 9:io 10:sh Average - cloudflare (1.1.1.1) 9 9 9 9 9 9 -9 9 9 16 9.70 ms - dns_watch (84.200.69.80) 11 11 11 11 11 11 -11 11 11 11 11.00 ms - verisign (64.6.64.6) 16 16 16 15 15 17 -15 15 16 16 15.70 ms - level3 (209.244.0.3) 21 15 15 15 21 17 15 17 22 15 17.30 ms - neustar (156.154.70.1) 17 17 17 17 17 17 -17 17 17 22 17.50 ms - norton (199.85.126.10) 17 17 17 17 17 18 17 17 17 17 17.10 ms - google (8.8.8.8) 8 30 8 14 25 8 -66 13 43 14 22.90 ms - quad9 (9.9.9.9) 23 23 23 23 23 24 -23 30 34 27 25.30 ms - uncensoredDNS (91.239.100.100) 29 28 28 28 29 29 -28 29 29 29 28.60 ms - opendns (208.67.222.222) 15 23 15 23 161 16 -15 20 24 17 32.90 ms - freenom (80.80.80.80) 27 52 37 23 32 26 -24 29 26 113 38.90 ms - freedns (37.235.1.174) 31 54 30 30 136 43 -30 53 55 45 50.70 ms - comodo (8.26.56.26) 226 21 37 23 46 20 -23 32 45 41 51.40 ms - adguard (176.103.130.130) 60 64 54 53 55 63 n/a 102 52 53 61.77 ms - alternate_dns (23.253.163.53) 98 98 98 97 97 98 -98 98 98 98 97.80 ms - yandex (77.88.8.8) 120 122 95 51 230 78 -90 91 85 83 104.50 ms - cleanbrowsing (185.228.168.168) 86 85 83 89 87 85 -87 158 259 85 110.40 ms - dyn_oracle (216.146.35.35) 83 89 83 92 92 89 -84 156 190 175 113.30 ms + cloudflare (1.1.1.1) 10 9 10 10 10 9 -10 9 10 9 9.60 ms + google (8.8.8.8) 14 14 9 9 38 9 -14 25 29 14 17.50 ms + neustar (156.154.70.1) 18 18 18 18 18 18 -18 18 18 18 18.00 ms + norton (199.85.126.10) 18 18 18 18 18 18 20 18 18 19 18.30 ms + opendns (208.67.222.222) 16 24 17 26 27 16 -17 28 17 16 20.40 ms + dns_watch (84.200.69.80) 29 30 29 29 29 29 -29 29 29 28 29.00 ms + uncensoredDNS (91.239.100.100) 34 33 33 33 33 34 -33 34 33 34 33.40 ms + level3 (209.244.0.3) 15 23 16 15 221 16 18 27 15 15 38.10 ms + verisign (64.6.64.6) 16 17 17 17 17 16 -18 164 87 18 38.70 ms + quad9 (9.9.9.9) 17 15 16 15 16 16 -19 20 258 16 40.80 ms + freedns (37.235.1.174) 31 31 54 31 298 31 -30 53 45 31 63.50 ms + adguard (176.103.130.130) 82 63 64 64 63 64 -64 110 64 63 70.10 ms + cleanbrowsing (185.228.168.168) 84 90 86 84 87 94 -88 90 90 86 87.90 ms + alternate_dns (23.253.163.53) 99 99 100 99 99 99 -99 99 99 99 99.10 ms + freenom (80.80.80.80) 26 60 40 23 137 28 -24 37 338 321 103.40 ms + comodo (8.26.56.26) 56 527 20 21 196 21 -33 46 147 61 112.80 ms + dyn_oracle (216.146.35.35) 92 86 90 93 319 97 -95 87 226 93 127.80 ms + yandex (77.88.8.8) 117 73 102 57 353 84 -59 97 88 286 131.60 ms tested domains ('easy' list): 1:debian.org 2:eurid.eu 3:free.fr 4:google.com 5:info.info 6:kernel.org 7:be.libre 8:ovh.net 9:packager.io 10:transfer.sh n/a indicates an inaccessible server, dash (-) indicates a domain not found - execution time: 13 s (02/06/2018 15:38 +0200) -``` + execution time: 14 s (20/06/2018 12:52 +0200) -```text IPV6 1:org 2:eu 3:fr 4:com 5:info 6:org 7:libre 8:net 9:io 10:sh Average - cloudflare (2606:4700:4700::1001) 9 9 9 9 9 9 -9 9 9 9 9.00 ms - google (2001:4860:4860::8888) 14 14 13 14 13 14 -14 13 38 13 16.00 ms - quad9 (2620:fe::fe) 15 24 30 15 15 15 -15 18 16 15 17.80 ms - verisign (2620:74:1b::1:1) 18 18 18 18 17 17 -16 18 18 17 17.50 ms - dns_watch (2001:1608:10:25::1c04:b12f) 22 22 22 22 22 22 -22 23 n/a 23 22.22 ms - neustar (2610:a1:1018::1) 23 23 23 23 27 25 22 23 26 23 23.80 ms - uncensoredDNS (2001:67c:28a4::) 39 39 40 39 40 40 -39 40 39 39 39.40 ms - adguard (2a00:5a60::ad1:0ff) 91 92 85 90 87 85 -91 159 123 89 99.20 ms - yandex (2a02:6b8::feed:0ff) 90 88 50 49 358 87 -218 92 83 52 116.70 ms + cloudflare (2606:4700:4700::1001) 10 10 10 10 10 12 -10 10 18 10 11.00 ms + quad9 (2620:fe::fe) 17 16 30 16 16 16 -16 17 16 16 17.60 ms + google (2001:4860:4860::8888) 14 14 14 14 24 14 -14 14 44 23 18.90 ms + dns_watch (2001:1608:10:25::1c04:b12f) 22 22 22 22 22 23 -22 36 37 22 25.00 ms + verisign (2620:74:1b::1:1) 19 18 18 18 154 18 -17 18 19 25 32.40 ms + uncensoredDNS (2001:67c:28a4::) 40 40 40 40 40 40 -40 40 40 40 40.00 ms + yandex (2a02:6b8::feed:0ff) 53 49 102 52 53 85 -55 93 111 117 77.00 ms + neustar (2610:a1:1018::1) 24 46 24 24 504 24 24 23 181 22 89.60 ms + adguard (2a00:5a60::ad1:0ff) 85 89 86 93 90 86 -86 185 95 88 98.30 ms tested domains ('easy' list): 1:debian.org 2:eurid.eu 3:free.fr 4:google.com 5:info.info 6:kernel.org 7:be.libre 8:ovh.net 9:packager.io 10:transfer.sh n/a indicates an inaccessible server, dash (-) indicates a domain not found - execution time: 19 s (02/06/2018 15:38 +0200) -``` + execution time: 20 s (20/06/2018 12:52 +0200) -```text IPV4 1:org 2:eu 3:fr 4:com 5:info 6:org 7:libre 8:net 9:io 10:sh Average - cloudflare (1.1.1.1) 9 9 20 9 9 9 -9 9 24 9 11.60 ms - google (8.8.8.8) 13 13 8 8 13 8 -14 8 31 13 12.90 ms - dns_watch (84.200.69.80) 11 11 11 11 14 11 -11 20 29 11 14.00 ms - level3 (209.244.0.3) 14 22 15 15 15 15 15 23 16 16 16.60 ms - norton (199.85.126.10) 17 18 17 17 17 17 18 18 17 18 17.40 ms - verisign (64.6.64.6) 15 16 16 16 15 16 -16 25 26 16 17.70 ms - neustar (156.154.70.1) 26 17 17 17 18 17 -17 17 17 17 18.00 ms - freedns (37.235.1.174) 30 30 30 30 30 30 -31 53 31 45 34.00 ms - comodo (8.26.56.26) 21 25 23 29 26 32 -21 118 45 49 38.90 ms - uncensoredDNS (91.239.100.100) 29 28 29 29 29 29 -29 117 45 29 39.30 ms - opendns (208.67.222.222) 15 23 15 23 236 15 -15 20 24 17 40.30 ms - quad9 (9.9.9.9) 23 23 23 23 22 24 -23 28 32 298 51.90 ms - adguard (176.103.130.130) 52 53 53 53 52 53 -53 52 99 62 58.20 ms - cleanbrowsing (185.228.168.168) 87 89 83 83 85 85 -87 87 85 85 85.60 ms - dyn_oracle (216.146.35.35) 91 83 87 93 85 85 -87 157 84 85 93.70 ms - freenom (80.80.80.80) 26 44 35 23 779 27 -25 29 46 35 106.90 ms - alternate_dns (23.253.163.53) 98 98 98 98 97 98 -98 194 102 98 107.90 ms - yandex (77.88.8.8) 242 51 95 51 427 51 -80 51 122 80 125.00 ms + cloudflare (1.1.1.1) 10 9 10 9 10 10 -10 10 10 10 9.80 ms + google (8.8.8.8) 13 15 9 9 26 9 -14 24 29 14 16.20 ms + neustar (156.154.70.1) 18 18 18 18 18 18 -18 18 18 18 18.00 ms + norton (199.85.126.10) 18 18 18 18 18 18 18 18 18 18 18.00 ms + level3 (209.244.0.3) 16 16 16 16 16 16 67 16 17 16 21.20 ms + dns_watch (84.200.69.80) 29 29 29 29 29 29 -29 28 29 29 28.90 ms + opendns (208.67.222.222) 16 26 16 24 101 17 -16 21 32 18 28.70 ms + verisign (64.6.64.6) 17 17 17 16 16 17 -17 162 19 17 31.50 ms + quad9 (9.9.9.9) 17 37 30 16 16 18 -15 19 16 282 46.60 ms + comodo (8.26.56.26) 47 21 20 20 175 21 -21 117 47 21 51.00 ms + uncensoredDNS (91.239.100.100) 34 34 33 33 33 34 -33 60 204 34 53.20 ms + freedns (37.235.1.174) 32 31 31 31 31 31 -31 54 338 31 64.10 ms + adguard (176.103.130.130) 63 65 63 64 64 64 -63 65 111 65 68.70 ms + freenom (80.80.80.80) 33 36 37 22 137 28 -31 29 111 289 75.30 ms + dyn_oracle (216.146.35.35) 86 89 84 92 93 89 -87 159 107 109 99.50 ms + cleanbrowsing (185.228.168.168) 88 88 93 88 87 84 -84 164 160 89 102.50 ms + yandex (77.88.8.8) 307 n/a 99 54 54 54 -105 96 95 54 102.00 ms + alternate_dns (23.253.163.53) 98 99 99 99 99 99 -101 194 101 99 108.80 ms tested domains ('atld' list): 1:debian.org 2:eurid.eu 3:free.fr 4:google.com 5:info.info 6:kernel.org 7:be.libre 8:ovh.net 9:packager.io 10:transfer.sh n/a indicates an inaccessible server, dash (-) indicates a domain not found - execution time: 13 s (02/06/2018 15:38 +0200) -``` + execution time: 15 s (20/06/2018 12:53 +0200) -```text IPV6 1:org 2:eu 3:fr 4:com 5:info 6:org 7:libre 8:net 9:io 10:sh Average - cloudflare (2606:4700:4700::1001) 10 9 9 10 9 9 -9 9 9 9 9.20 ms - quad9 (2620:fe::fe) 15 15 18 15 16 15 -17 19 24 15 16.90 ms - google (2001:4860:4860::8888) 14 14 13 8 14 14 -15 14 42 30 17.80 ms - verisign (2620:74:1b::1:1) 17 16 18 17 18 18 -17 17 18 18 17.40 ms - dns_watch (2001:1608:10:25::1c04:b12f) 23 22 22 22 23 22 n/a 22 22 23 22.33 ms - neustar (2610:a1:1018::1) 24 22 23 26 24 24 22 23 23 24 23.50 ms - uncensoredDNS (2001:67c:28a4::) 39 39 39 39 47 44 -39 40 41 40 40.70 ms - adguard (2a00:5a60::ad1:0ff) 91 85 94 85 92 85 -85 83 92 86 87.80 ms - yandex (2a02:6b8::feed:0ff) 111 90 94 49 200 51 n/a 87 82 81 93.88 ms + cloudflare (2606:4700:4700::1001) 10 10 10 10 10 10 -10 10 19 10 10.90 ms + quad9 (2620:fe::fe) 17 16 16 16 35 16 -16 20 20 16 18.80 ms + verisign (2620:74:1b::1:1) 17 19 18 19 18 18 -18 18 18 19 18.20 ms + google (2001:4860:4860::8888) 14 28 14 17 9 14 -47 24 37 9 21.30 ms + dns_watch (2001:1608:10:25::1c04:b12f) 22 23 22 22 23 22 -22 22 22 22 22.20 ms + neustar (2610:a1:1018::1) 23 23 23 23 24 24 23 23 23 23 23.20 ms + uncensoredDNS (2001:67c:28a4::) 40 40 40 40 40 40 -40 40 40 40 40.00 ms + adguard (2a00:5a60::ad1:0ff) 86 90 88 94 86 92 -94 86 86 100 90.20 ms + yandex (2a02:6b8::feed:0ff) 144 94 52 53 498 83 -88 92 119 53 127.60 ms tested domains ('atld' list): 1:debian.org 2:eurid.eu 3:free.fr 4:google.com 5:info.info 6:kernel.org 7:be.libre 8:ovh.net 9:packager.io 10:transfer.sh n/a indicates an inaccessible server, dash (-) indicates a domain not found - execution time: 20 s (02/06/2018 15:39 +0200) + execution time: 20 s (20/06/2018 12:53 +0200) + ``` Remark: the list *atld* is formed with alternative tld, so it can be _normal_ to get short response times, when the DNS does not support these TLDs (domain not found). diff --git a/docs/scripts/getInfo.md b/docs/scripts/getInfo.md index 0251b7b..842dd73 100644 --- a/docs/scripts/getInfo.md +++ b/docs/scripts/getInfo.md @@ -1,6 +1,6 @@ # getInfo -![version: 4.8.1](https://img.shields.io/badge/version-4.8.1-blue.svg?longCache=true&style=for-the-badge) +![version: 4.9.0](https://img.shields.io/badge/version-4.9.0-blue.svg?longCache=true&style=for-the-badge) ![bash langage](https://img.shields.io/badge/bash-4-brightgreen.svg?longCache=true&style=for-the-badge) ![license LPRAB / WTFPL](https://img.shields.io/badge/license-LPRAB%20%2F%20WTFPL-blue.svg?longCache=true&style=for-the-badge) @@ -37,8 +37,8 @@ chmod +x getInfo __ _ ___| |_|_ _|_ __ / _| ___ / _' |/ _ \ __|| || '_ \| |_ / _ \ | (_| | __/ |_ | || | | | _| (_) | - \__, |\___|\__|___|_| |_|_| \___/ - |___/ version 4.7.0 - 16/06/2018 + \__, |\___|\__|___|_| |_|_| \___/ -h + |___/ version 4.9.0 - 20/06/2018 •ø••••••••••••••••◇◇◇••••• @@ -77,9 +77,9 @@ chmod +x getInfo **getInfo_rapport.md** * ultérieurement, le rapport est consultable avec la commande `./getInfo -l` * ultérieurement, le rapport peut être (re)exporté avec la commande `./getInfo -p` -* la durée du paste peut être configurée avec l'option supplémentaire `-tn` (n=nombre de jours), par exemple: - * `./getInfo -p -t14` pour exporter un rapport existant pour une période de 14 jours - * `./getInfo -t21` pour former et exporter un rapport pour une période de 21 jours +* la durée du paste peut être configurée avec l'option supplémentaire `-t n` (n=nombre de jours), par exemple: + * `./getInfo -p -t 14` pour exporter un rapport existant pour une période de 14 jours + * `./getInfo -t 21` pour former et exporter un rapport pour une période de 21 jours ## alertes / informations @@ -146,14 +146,14 @@ chmod +x getInfo / _' |/ _ \ __|| || '_ \| |_ / _ \ | (_| | __/ |_ | || | | | _| (_) | \__, |\___|\__|___|_| |_|_| \___/ -h - |___/ version 4.7.0 - 16/06/2018 + |___/ version 4.9.0 - 20/06/2018 ./getInfo : exécution script getInfo : exécution script installé dans le système ----------------------------------------------------------------------- getInfo -c : (catégorie) menu sélection catégorie d'analyse - getInfo -cs : catégorie système -cs : catégorie configuration - getInfo -cr : catégorie réseau -ca : catégorie analyse + getInfo -cs : catégorie système -cc : catégorie configuration -csc : système&configuration + getInfo -cr : catégorie réseau -ca : catégorie analyse -cscra: toutes les 4 catégories getInfo -j : (journaux) analyse démarrage système, log Xorg, kernel et système, catégorie -ca getInfo -l : (list) afficher le rapport markdown existant getInfo -p : (paste) exporte le rapport markdown existant, durée standard du paste 7 jours @@ -164,9 +164,10 @@ chmod +x getInfo getInfo --serial : affiche n° série disques, batterie et châssis, pas de rapport markdown getInfo --ssid : affiche configurations ssid, pas de rapport markdown, root & NetworkManager requis + --debug-paste : affichage retour json de de l'export sur pastebin --debug : messages d'erreur (stderr) logués et exportés avec le rapport --dev : une version de dev du script (si existante) est recherchée - -tn : durée de conservation du paste de n jour(s) + -t n, --time n : temps de conservation du paste, par défaut 7 jours ----------------------------------------------------------------------- ./getInfo -i : installation du script dans le système (root) getInfo -h, --help : affichage aide diff --git a/docs/scripts/getInfo_plus.md b/docs/scripts/getInfo_plus.md index 9c64395..8d4293d 100644 --- a/docs/scripts/getInfo_plus.md +++ b/docs/scripts/getInfo_plus.md @@ -12,8 +12,8 @@ de téléchargement) seront alors sous la forme `getInfo ...`. __ _ ___| |_|_ _|_ __ / _| ___ / _' |/ _ \ __|| || '_ \| |_ / _ \ | (_| | __/ |_ | || | | | _| (_) | - \__, |\___|\__|___|_| |_|_| \___/ - |___/ version 4.7.0 - 16/06/2018 + \__, |\___|\__|___|_| |_|_| \___/ -c + |___/ version 4.9.0 - 20/06/2018 getInfo -h : afficher l'aide @@ -40,8 +40,8 @@ de téléchargement) seront alors sous la forme `getInfo ...`. ou `dmesg`) ne seront pas extraits * `getInfo -l` affiche un rapport _getInfo_rapport.md_ existant * `getInfo -p` exporte un rapport _getInfo_rapport.md_ existant sur le pastebin - * l'option supplémentaire `-tn` permet de remplacer la durée de conservation **standard de 7 jours** par - **n** jours (par exemple -t1: le paste sera effacé au bout de 1 jour) + * l'option supplémentaire `-t n` permet de remplacer la durée de conservation **standard de 7 jours** par + **n** jours (par exemple -t 1: le paste sera effacé au bout de 1 jour) * `getInfo -us` (update spécial), le script est mis à jour là où il est, sans installation pré-requise * `gfetch` lanceur sur `getInfo --rc` ( si script installé ) diff --git a/docs/scripts/ipupdate.md b/docs/scripts/ipupdate.md index 3f553cd..ebaa9d7 100644 --- a/docs/scripts/ipupdate.md +++ b/docs/scripts/ipupdate.md @@ -1,8 +1,7 @@ # ipupdate -![version: 1.3.0](https://img.shields.io/badge/version-1.3.0-blue.svg?longCache=true&style=for-the-badge) +![version: 1.4.0](https://img.shields.io/badge/version-1.4.0-blue.svg?longCache=true&style=for-the-badge) ![bash langage](https://img.shields.io/badge/bash-version4-brightgreen.svg) -![status](https://img.shields.io/badge/status-release-green.svg) ![license LPRAB / WTFPL](https://img.shields.io/badge/license-LPRAB%20%2F%20WTFPL-blue.svg) @@ -77,7 +76,7 @@ cp ipupdate.conf.sample ipupdate.conf | | '_ \| | | | '_ \ / _' |/ _' | __/ _ \ | | |_) | |_| | |_) | (_| | (_| | || __/ |_| .__/ \__,_| .__/ \__,_|\__,_|\__\___| -h - |_| |_| 1.2.0 16/06/2018 + |_| |_| 1.4.0 20/06/2018 usage : ipupdate [options] ( les options et les arguments doivent etre séparés par 1 espace ) @@ -110,7 +109,7 @@ cp ipupdate.conf.sample ipupdate.conf toto.hn.org (hn) : 99.111.255.44 toto.freemyip.com (freemyip): 99.111.255.44 Ip publique: - 99.111.255.44 2001:db8:0:0:1::1 + 99.111.255.44 2001:db8:0:0:1::1 plus d'infos: https://framaclic.org/h/doc-ipupdate @@ -292,7 +291,7 @@ si l'envoi de mails est configuré, voir `ipupdate.conf` et activé `envoi_mail= ## sources -[framagit (gitlab) (framasoft service)](https://framagit.org/sdeb/ipupdate/tree/master#ipupdate) +[framagit (gitlab) (framasoft service)](https://framagit.org/sdeb/ipupdate/tree/master/ipupdate) ## license diff --git a/docs/scripts/nstest.md b/docs/scripts/nstest.md index 07c39cf..a115344 100644 --- a/docs/scripts/nstest.md +++ b/docs/scripts/nstest.md @@ -1,7 +1,7 @@ # nstest -![version: 1.6.5](https://img.shields.io/badge/version-1.6.5-blue.svg?longCache=true&style=for-the-badge) +![version: 1.8.0](https://img.shields.io/badge/version-1.8.0-blue.svg?longCache=true&style=for-the-badge) ![bash langage](https://img.shields.io/badge/bash-4-brightgreen.svg?longCache=true&style=for-the-badge) ![license LPRAB / WTFPL](https://img.shields.io/badge/license-LPRAB%20%2F%20WTFPL-blue.svg?longCache=true&style=for-the-badge) @@ -20,32 +20,35 @@ It can be exported the report on a pastebin for easy exchange. ## usage +```shell +./nstest -h +``` ```text _ _ _ __ ___| |_ ___ ___| |_ | '_ \/ __| __/ _ \/ __| __| | | | \__ \ || __/\__ \ |_ |_| |_|___/\__\___||___/\__| -h - version: 1.6 02/06/2018 + version: 1.8.0 20/06/2018 usage: nstest [options] ( options and arguments must be SEPARATED by one space ) - -4, -6, -46 : protocols to use: ipv4, ipv6, ipv4 & ipv6. by default, the protocol(s) used in the net layer - --bench : run with all lists of domains to test - --dev : use dev branch for update or for version number - --drill : drill is forced if existing, otherwise dig has priority - -e, --export : export on a pastebin - -c, --compress: no extended report, only time averages - -d, --domains : choice between 3 test domain lists: base (defaut), alt, atld, or easy - -f, --file : the ip in are tested, replace /etc/resolv.conf. format: ip[ # name] per line - --nodns : only the nameservers in /etc/resolv.conf or in are tested, no other dns servers used - --noresolv: the file /etc/resolv.conf is not read, implied with --file - --nosort : no sorted report on average column - --opt : print list of dns servers and domains used for tests - -h, --help : this help - -s, --sort : sort on domain number - -u, --upgrade : load and replace the script in place - -v, --version : version of the script online and in place + -4, -6, -46 : protocols to use: ipv4, ipv6, ipv4 & ipv6. by default, the protocol(s) used in the net layer + --bench : run with all lists of domains to test + --dev : use dev branch for update or for version number + --drill : drill is forced if existing, otherwise dig has priority (or host if existing) + -e, --export : export on a pastebin, the file nstest_report.md created for that + -c, --compress : no extended report, only time averages + -d, --domains : choice between 3 test domain lists: base (defaut), alt, atld, or easy + -f, --file : the ip in are tested, replace /etc/resolv.conf. format: ip[ # name] per line + --nodns : only the nameservers in /etc/resolv.conf or in are tested, no other dns servers used + --noresolv : the file /etc/resolv.conf is not read, implied with --file + --nosort : no sorted report on average column + --opt : print list of dns servers and domains used for tests + -h, --help : this help + -s, --sort : sort on domain number + -u, --upgrade : load and replace the script in place + -v, --version : version of the script online and in place examples: ./ntest : full report, with nameservers in /etc/resolv.conf and few open DNS servers @@ -141,7 +144,7 @@ some servers, outside OpenNic, resolve alternative domain names, today: level3 & ## sources -[framagit (gitlab) (framasoft service)](https://framagit.org/sdeb/nstest/blob/master/README.md#nstest) +[framagit (gitlab) (framasoft service)](https://framagit.org/sdeb/nstest/blob/master/nstest) ## license diff --git a/scripts/getInfo b/scripts/getInfo index b7fb712..e63e15c 100755 --- a/scripts/getInfo +++ b/scripts/getInfo @@ -5,8 +5,8 @@ # SC2016 Expressions don't expand in single quotes # SC2009 Consider using pgrep instead of grepping ps output -version=4.8.1 -date="18/06/2018" +version=4.9.0 +date="20/06/2018" script="getInfo" contact="IRC freenode.net ##sdeb@freenode.net ou https://framagit.org/sdeb/getInfo/issues" @@ -567,7 +567,7 @@ f_grep_file(){ # 18/06/2018 echo -en "$display" } -f_help(){ # 16/06/2018 +f_help(){ # 19/06/2018 tput cuu1 # une ligne plus haut cat <<- end @@ -576,8 +576,8 @@ f_help(){ # 16/06/2018 ${GREEN}getInfo :$STD exécution script installé dans le système ----------------------------------------------------------------------- $BLUE$script -c :$STD (catégorie) menu sélection catégorie d'analyse - $BLUE$script -cs :$STD catégorie système $BLUE-cs$STD : catégorie configuration - $BLUE$script -cr :$STD catégorie réseau $BLUE-ca$STD : catégorie analyse + $BLUE$script -cs :$STD catégorie système $BLUE-cc$STD : catégorie configuration $BLUE-csc$STD : système&configuration + $BLUE$script -cr :$STD catégorie réseau $BLUE-ca$STD : catégorie analyse $BLUE-cscra$STD: toutes les 4 catégories $BLUE$script -j :$STD (journaux) analyse démarrage système, log Xorg, kernel et système, catégorie -ca $BLUE$script -l :$STD (list) afficher le rapport markdown existant $BLUE$script -p :$STD (paste) exporte le rapport markdown existant, durée standard du paste 7 jours @@ -588,9 +588,10 @@ f_help(){ # 16/06/2018 $BLUE$script --serial :$STD affiche n° série disques, batterie et châssis, pas de rapport markdown $BLUE$script --ssid :$STD affiche configurations ssid, pas de rapport markdown,$RED root & NetworkManager$STD requis + $GREEN --debug-paste :$STD affichage retour json de de l'export sur pastebin $GREEN --debug :$STD messages d'erreur (stderr) logués et exportés avec le rapport $GREEN --dev :$STD une version de dev du script (si existante) est recherchée - $GREEN -tn :$STD durée de conservation du paste de$GREEN n$STD jour(s) + $GREEN -t n, --time n :${STD} temps de conservation du paste, par défaut 7 jours ----------------------------------------------------------------------- $BLUE./$script -i$STD : installation du script dans le système $RED(root)$STD $BLUE$script -h$STD, --help : affichage aide @@ -4446,7 +4447,8 @@ figet_wm(){ # 06/03/2018 base départ neofetch } # aiguillage export paste, insertion fichier log (debug script) -fipaste(){ # 15/06/2018 +fipaste(){ # 20/06/2018 + if ! f__requis "curl"; then f__info "une fois Curl installé, inutile de relancer la détection" \ "$GREEN $DIRNAME""getInfo -p" "pour exporter le rapport existant" @@ -4461,37 +4463,8 @@ fipaste(){ # 15/06/2018 } >> "$file_output" rm -f "$debug_output" fi - fipaste_curl_pastery "$file_output" "$pasteDuration" "$optDebug" - # à tester fipaste_curl_markdownshare "$file_output" -} - - # $1=fichier à exporter, $2 durée de conservation en jour; $3 debug -fipaste_curl_pastery(){ # 06/03/2018 - local curl id pluriel - - [ -e "$1" ] || f__error "fichier $1 inexistant" -# curl -X POST "https://www.pastery.net/api/paste/?title=getInfo&language=markdown" -F file=@$1 -# un fichier simple curl https://www.pastery.net/api/paste/ -F file=@data.txt - curl=$( curl --silent -X POST "https://www.pastery.net/api/paste/?title=getInfo_$version&language=markdown&duration=$(( $2*1440 ))" --data-binary @"$1" ) - if grep -q '"result": "error' <<< "$curl" ;then - f__info "${RED}Erreur critique export rapport:" - f__info "$curl" - else - id=$( echo "$curl" | cut -d '"' -f 4 ) - if [ $(( pasteDuration )) -gt 1 ]; then pluriel="s"; else unset pluriel; fi - f__info "votre paste:$GREEN https://www.pastery.net/$id/" \ - "(valide pendant $RED$pasteDuration jour$pluriel)" - echo -e "exporté sur https://www.pastery.net/$id/ \n\n" >> "$file_output" - fi - [ "$3" == "debugPaste" ] && f__info "$curl" -# UTF-8 -# ?api_key= -# &duration= en mn, 1 jour par défaut -# &language=autodetect possible -# &max_views= -# 100ko max -#{"id": "kddgar", "title": "getInfo_2.5.0", "url": "https://www.pastery.net/kddgar/", "language": "markdown", "duration": 1439} -#{"result": "error", "error_msg": "Your request body was not valid UTF-8."} + fipaste_pastery "$file_output" 'markdown' "$optDebug" + # à tester fipaste_curl_markdownshare "$file_output" 'markdown' "$optDebug" } fipaste_curl_markdownshare(){ # à tester/finir @@ -4502,6 +4475,40 @@ fipaste_curl_markdownshare(){ # à tester/finir #expire=Nh Expire in N hours. #expire=Nd Expire in N days. #-d expire ? ou --data expire +} + + # $1 file to paste, $2 language, [$3="debugPaste" afficher retour paste], requires $pasteDuration +fipaste_pastery(){ # 20/06/2018-2 + local title language="$2" pasted csv id pastebin='pastery.net' + + type -t f__info &>/dev/null && c_echo="f__info" || c_echo="echo -e" # f__info existe? sinon echo + [ ! -e "$1" ] && c_echo "fichier $1 inexistant" + type -t f__basedirname &>/dev/null && f__basedirname "$1" + basename=${basename:""} + [ "$basename" ] && title="$basename-${script}_$version" || title="${script}_$version" + [ "$language" == 'auto' ] && language='autodetect' + # un fichier simple curl https://www.pastery.net/api/paste/ -F file=@data.txt + pasted="$( curl --silent "https://www.pastery.net/api/paste/?title=$title&language=$language&duration=$(( pasteDuration*1440 ))" -F file=@"$1" )" + if [[ $pasted =~ \(.*5[0-9].*error.*)\ ]]; then + $c_echo "$RED"" Erreur export sur $pastebin:$STD \\n ${BASH_REMATCH[1]}" + elif [[ $pasted =~ \"result\":\ \"error ]]; then + $c_echo "$RED"" Erreur export sur $pastebin:$STD \\n $pasted" + else + IFS=', ' read -r -a csv <<< "$pasted" + id=${csv[1]%\"} + id=${id#\"} + if (( pasteDuration > 1 )); then pluriel="s"; else unset pluriel; fi + $c_echo " lien paste: ${GREEN} https://www.pastery.net/$id/ $STD(valide pendant $RED$pasteDuration jour$pluriel)$STD" + fi + [ "$3" == "debugPaste" ] && c_echo "$pasted" +# UTF-8 +# ?api_key= +# &duration= en mn, 1 jour par défaut +# &language=autodetect possible +# &max_views= +# 100ko max ?? +# {"id": "dntzpd", "title": "LICENSE.md-pastit_0.3.0a", "url": "https://www.pastery.net/dntzpd/", "language": "markdown", "duration": 10079} +# {"result": "error", "error_msg": "Your request body was not valid UTF-8."} } # fonction spécifique à l'installation @@ -4781,10 +4788,10 @@ prg_1(){ # 16/06/2018d début echo -e "$ligneRapport \\n" >> "$file_output" echo -e "--- \\n" >> "$file_output" } -prg_2(){ # 08/03/2018 traitements principaux +prg_2(){ # 19/06/2018 traitements principaux if [[ "$1" == all || "$1" =~ s ]]; then #systeme, matériel -cs - echo -e "# ▷ Système" >> "$file_output" + echo -e "# Système" >> "$file_output" for i in fi_system fi_cpu fi_mem fi_hw fi_batt fi_gpu fi_net fi_audio fi_touchpad fi_bluez fi_usb fi_disk ; do echo -n "•" [ "$debugScript" == "ok" ] && echo -e "\n$i : " 1>&2 @@ -4792,7 +4799,7 @@ prg_2(){ # 08/03/2018 traitements principaux done fi if [[ "$1" == all || "$1" =~ c ]]; then #configuration #debian, packages -cc - echo -e "# ▷ Configuration" >> "$file_output" + echo -e "# Configuration" >> "$file_output" for i in fi_efi fi_locale fi_conf fi_vrms fi_packagers ; do echo -n "•" [ "$debugScript" == "ok" ] && echo -e "\n$i : " 1>&2 @@ -4800,7 +4807,7 @@ prg_2(){ # 08/03/2018 traitements principaux done fi if [[ "$1" == all || "$1" =~ r ]]; then #reseau -cr - echo -e "# ▷ Réseau" >> "$file_output" + echo -e "# Réseau" >> "$file_output" for i in fi_reseau fi_nm ; do echo -n "•" [ "$debugScript" == "ok" ] && echo -e "\n$i : " 1>&2 @@ -4808,7 +4815,7 @@ prg_2(){ # 08/03/2018 traitements principaux done fi if [[ "$1" == all || "$1" =~ a ]]; then #analyse -ca - echo -e "# ▷ Analyse" >> "$file_output" + echo -e "# Analyse" >> "$file_output" for i in fi_system_analyse fi_journal_xorg fi_journal ; do echo -n "•" [ "$debugScript" == "ok" ] && echo -e "\n$i : " 1>&2 @@ -4883,7 +4890,7 @@ script_install="/opt/bin/$script" script_logs="/var/log/sdeb_$script.log" url_script="https://framagit.org/sdeb/getInfo/raw/master/getInfo" url_notice="https://framaclic.org/h/doc-getinfo" -pasteDuration=7 # durée de conservation standard du paste en jours +default_duration=7 # durée de conservation du paste par défaut spc5=$'\xc2\xa0\xc2\xa0\xc2\xa0\xc2\xa0' ligneRapport="Rapport du $(date '+%d/%m/%Y %H:%M %z')$spc5◇$spc5$0 $*$spc5◇${spc5}[$script $version]($url_notice)" @@ -4908,14 +4915,15 @@ while (( $# )) ; do exec 2> "$debug_output" # redirection echo -e "$ligneRapport \\n" 1>&2 ;; --dev ) url_script=${url_script//\/master\///dev/} ;; - -t ) options+=( "$1" ) ;; - -t* ) # durée de conservation standard du paste en jours - pasteDuration=$(( ${1#-t} )) - (( pasteDuration == 0 )) && pasteDuration=1 ;; + -t ) # durée de conservation standard du paste en jours + pasteDuration="$2" + shift ;; + -t* ) pasteDuration="${1#-t}" ;; # durée de conservation standard du paste en jours * ) options+=( "$1" ) ;; esac shift done +(( pasteDuration == 0 )) && pasteDuration="$default_duration" # par défaut [ "$categorie" ] && options+=( -c"$categorie" ) (( ${#options[@]} == 0 )) && options=( all )