Browse Source

shellrc: improve installrc.sh/ansible-vault

Maxim Likhachev 3 years ago
parent
commit
ffeda98d8f
  1. 4
      etc/soft/joplin/userchrome.css
  2. 7
      etc/soft/joplin/userstyle.css
  3. 8
      installrc.sh

4
etc/soft/joplin/userchrome.css

@ -1922,14 +1922,14 @@ div[style*="z-index: 9999;"][style*="background-color: rgba(0, 0, 0, 0.6);"][sty @@ -1922,14 +1922,14 @@ div[style*="z-index: 9999;"][style*="background-color: rgba(0, 0, 0, 0.6);"][sty
opacity: 1;
display: flex;
line-height: 2.8rem;
overflow: hidden;
/* overflow: hidden; */
width: 100%;
}
.sidebar.sidebar > div .list-item .title,
.sidebar.sidebar > div .list-item .tag-label {
color: var(--s-sidebar__item-Color);
font-size: 1.3rem;
overflow: hidden;
/* overflow: hidden; */
text-overflow: ellipsis;
flex: 1;
}

7
etc/soft/joplin/userstyle.css

@ -516,3 +516,10 @@ nav.table-of-contents li:before { @@ -516,3 +516,10 @@ nav.table-of-contents li:before {
content: "" !important;
}
/* BADGES */
progress {
height: 1.8em;
vertical-align: bottom;
}

8
installrc.sh

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
#!/usr/bin/env bash
#Создан: Пт 23 авг 2013 19:57:29
#Изменён: Пн 06 дек 2021 13:13:59
#Изменён: пн 06 дек 2021 13:24:11
#
# (c) 2013-2021, Maxim Lihachev, <envrm@yandex.ru>
@ -177,16 +177,16 @@ decrypt() { @@ -177,16 +177,16 @@ decrypt() {
mkdir -p "$(dirname "$DST")"
USE_PASSWORD_FILE=""
VAULT_PASSWORD="--ask-vault-password"
if [ -n "$SECRET" ]; then
USE_PASSWORD_FILE="--vault-password-file=$SECRET"
VAULT_PASSWORD="--vault-password-file=$SECRET"
fi
report Раскодирование "$SRC"
if [ -a "$DST" ]; then
echo -e Раскодирование не требуется
else
ansible-vault decrypt "$USE_PASSWORD_FILE" "$SRC" --output "$DST"
ansible-vault decrypt "$VAULT_PASSWORD" "$SRC" --output "$DST"
fi
}

Loading…
Cancel
Save