toolshed/abra-bash
Archived
5
0
Fork 3
Code Pull Requests Releases Activity

Appease shellcheck
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Luke Murphy
2020-11-05 16:00:50 +01:00
parent b75bce531b
commit f495ec0d94
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
abra
View File

@ -410,7 +410,8 @@ parse_secret() {
SECRET="$1" SECRET="$1"
if [[ "$SECRET" == *"length"* ]]; then if [[ "$SECRET" == *"length"* ]]; then
abra__length_="$(echo $SECRET | sed -e 's/.*[^0-9]\([0-9]\+\)[^0-9]*$/\1/')" # shellcheck disable=SC2001
abra__length_="$(echo "$SECRET" | sed -e 's/.*[^0-9]\([0-9]\+\)[^0-9]*$/\1/')"
else else
abra__length_=32 abra__length_=32
fi fi
@ -419,7 +420,7 @@ parse_secret() {
abra__secret_="${abra__secret_#SECRET_}" # strip SECRET_ abra__secret_="${abra__secret_#SECRET_}" # strip SECRET_
abra__secret_="${abra__secret_,,}" # lowercase abra__secret_="${abra__secret_,,}" # lowercase
abra__version_="$(echo $SECRET | sed -n 's/.*\(v[0-9]\).*/\1/p')" abra__version_="$(echo "$SECRET" | sed -n 's/.*\(v[0-9]\).*/\1/p')"
echo "Generating $abra__secret_, version: $abra__version_, length: $abra__length_" echo "Generating $abra__secret_, version: $abra__version_, length: $abra__length_"
sub_app_secret_generate sub_app_secret_generate
@ -901,7 +902,8 @@ abra() {
declare abra___stack abra___env abra__command_ abra__args_ \ declare abra___stack abra___env abra__command_ abra__args_ \
abra__secret_ abra__version_ abra__data_ abra___user abra__host_ \ abra__secret_ abra__version_ abra__data_ abra___user abra__host_ \
abra__app_ abra__port_ abra__user_ abra__service_ abra__src_ abra__dst_ \ abra__app_ abra__port_ abra__user_ abra__service_ abra__src_ abra__dst_ \
abra__domain_ abra___server abra___domain abra___force abra___pass abra__domain_ abra___server abra___domain abra___force abra___pass \
abra___auto
if ! type tput > /dev/null 2>&1; then if ! type tput > /dev/null 2>&1; then
tput() { tput() {