From 10cd1870060870a7acf0f6f1a383e416aceee161 Mon Sep 17 00:00:00 2001 From: dannc Date: Tue, 12 Apr 2022 10:33:57 +0700 Subject: [PATCH] add notes 04-yaml, move homework 4.1 to subdirectory --- src/homework/{ => 04-script}/4.1/.gitignore | 0 src/homework/{ => 04-script}/4.1/q1_script.sh | 0 src/homework/{ => 04-script}/4.1/q2_script.sh | 0 src/homework/{ => 04-script}/4.1/q3_script.sh | 0 src/homework/{ => 04-script}/4.1/q4_script.sh | 0 .../4.1/q5_example_bad_lenght.txt | 0 .../4.1/q5_example_bad_pattern.txt | 0 .../{ => 04-script}/4.1/q5_example_good.txt | 0 src/homework/{ => 04-script}/4.1/q5_script.sh | 0 src/homework/{ => 04-script}/4.1/readme.md | 10 +++--- src/homework/04-script/notes.md | 35 +++++++++++++++++++ 11 files changed, 40 insertions(+), 5 deletions(-) rename src/homework/{ => 04-script}/4.1/.gitignore (100%) rename src/homework/{ => 04-script}/4.1/q1_script.sh (100%) rename src/homework/{ => 04-script}/4.1/q2_script.sh (100%) rename src/homework/{ => 04-script}/4.1/q3_script.sh (100%) rename src/homework/{ => 04-script}/4.1/q4_script.sh (100%) rename src/homework/{ => 04-script}/4.1/q5_example_bad_lenght.txt (100%) rename src/homework/{ => 04-script}/4.1/q5_example_bad_pattern.txt (100%) rename src/homework/{ => 04-script}/4.1/q5_example_good.txt (100%) rename src/homework/{ => 04-script}/4.1/q5_script.sh (100%) rename src/homework/{ => 04-script}/4.1/readme.md (97%) diff --git a/src/homework/4.1/.gitignore b/src/homework/04-script/4.1/.gitignore similarity index 100% rename from src/homework/4.1/.gitignore rename to src/homework/04-script/4.1/.gitignore diff --git a/src/homework/4.1/q1_script.sh b/src/homework/04-script/4.1/q1_script.sh similarity index 100% rename from src/homework/4.1/q1_script.sh rename to src/homework/04-script/4.1/q1_script.sh diff --git a/src/homework/4.1/q2_script.sh b/src/homework/04-script/4.1/q2_script.sh similarity index 100% rename from src/homework/4.1/q2_script.sh rename to src/homework/04-script/4.1/q2_script.sh diff --git a/src/homework/4.1/q3_script.sh b/src/homework/04-script/4.1/q3_script.sh similarity index 100% rename from src/homework/4.1/q3_script.sh rename to src/homework/04-script/4.1/q3_script.sh diff --git a/src/homework/4.1/q4_script.sh b/src/homework/04-script/4.1/q4_script.sh similarity index 100% rename from src/homework/4.1/q4_script.sh rename to src/homework/04-script/4.1/q4_script.sh diff --git a/src/homework/4.1/q5_example_bad_lenght.txt b/src/homework/04-script/4.1/q5_example_bad_lenght.txt similarity index 100% rename from src/homework/4.1/q5_example_bad_lenght.txt rename to src/homework/04-script/4.1/q5_example_bad_lenght.txt diff --git a/src/homework/4.1/q5_example_bad_pattern.txt b/src/homework/04-script/4.1/q5_example_bad_pattern.txt similarity index 100% rename from src/homework/4.1/q5_example_bad_pattern.txt rename to src/homework/04-script/4.1/q5_example_bad_pattern.txt diff --git a/src/homework/4.1/q5_example_good.txt b/src/homework/04-script/4.1/q5_example_good.txt similarity index 100% rename from src/homework/4.1/q5_example_good.txt rename to src/homework/04-script/4.1/q5_example_good.txt diff --git a/src/homework/4.1/q5_script.sh b/src/homework/04-script/4.1/q5_script.sh similarity index 100% rename from src/homework/4.1/q5_script.sh rename to src/homework/04-script/4.1/q5_script.sh diff --git a/src/homework/4.1/readme.md b/src/homework/04-script/4.1/readme.md similarity index 97% rename from src/homework/4.1/readme.md rename to src/homework/04-script/4.1/readme.md index 11da41e..1c9583f 100644 --- a/src/homework/4.1/readme.md +++ b/src/homework/04-script/4.1/readme.md @@ -5,7 +5,7 @@ ## Обязательная задача 1 -Есть [скрипт](./q1_script.sh): +Есть [скрипт](q1_script.sh): ```shell a=1 b=2 @@ -38,7 +38,7 @@ done ### Ваш скрипт: -[script](./q2_script.sh) +[script](q2_script.sh) ```shell #!/usr/bin/env bash @@ -61,7 +61,7 @@ done ### Ваш скрипт: -[script](./q3_script.sh) +[script](q3_script.sh) ```shell #!/usr/bin/env bash @@ -84,7 +84,7 @@ done ### Ваш скрипт: -[script](./q4_script.sh) +[script](q4_script.sh) ```shell #!/usr/bin/env bash @@ -124,7 +124,7 @@ done ### Ваш скрипт: -[script](./q5_script.sh) +[script](q5_script.sh) ```shell #!/usr/bin/env bash diff --git a/src/homework/04-script/notes.md b/src/homework/04-script/notes.md index 08b6f4f..2e118e8 100644 --- a/src/homework/04-script/notes.md +++ b/src/homework/04-script/notes.md @@ -40,4 +40,39 @@ arrayInt+=(12 123 13) echo $IFS export IFS=; unset IFS +``` + +## YAML + +* Типы данных + +```yaml +root: + emptyValue: + booleanTrue: true + booleanFalse: false + canonTime: 2020-12-15T00:30:44.1Z + date: 2020-12-15 + list: + - one + - two + - three + - name: one + type: two + default: true + using: [ localhost, 7.7.7.7 ] +``` + +* Многострочные значения в ключе + +```yaml +--- +root: + first:| + Этот вид + сохранит все переходы на новую строку + second:> + А этот + преобразует каждый переход на новую строку + в пробел ``` \ No newline at end of file