Improve output

This commit is contained in:
2022-02-27 11:32:55 +01:00
parent 3f93e6a846
commit 9e81cd32fe
4 changed files with 14 additions and 9 deletions

View File

@@ -31,7 +31,7 @@ step_config() {
initSeqConfig "$CONFIG_FILE_NAME" "$CONFIG_FILE_TEMPLATE" initSeqConfig "$CONFIG_FILE_NAME" "$CONFIG_FILE_TEMPLATE"
if [ $? -eq 0 ] ; then if [ $? -eq 0 ] ; then
CONFIG=1 CONFIG=1
echo " Domain: $MAS_DOMAIN" echoseq " Domain: $MAS_DOMAIN"
elif [ $? -eq 1 ] ; then elif [ $? -eq 1 ] ; then
# Config $CONFIG_FILE_NAME created. Needs modification first # Config $CONFIG_FILE_NAME created. Needs modification first
[ $DRY -eq 0 ] && return -1 [ $DRY -eq 0 ] && return -1

View File

@@ -50,6 +50,8 @@ step_config() {
echo " $toolName home: $MATRIX_HOME" echo " $toolName home: $MATRIX_HOME"
echo " $toolName domain: $MATRIX_DOMAIN" echo " $toolName domain: $MATRIX_DOMAIN"
fi fi
return 0
} }
step_1_info() { echo "Installing $toolName dependencies"; } step_1_info() { echo "Installing $toolName dependencies"; }
@@ -556,5 +558,5 @@ adminTokenCheck() {
return 0 return 0
} }
VERSION_SEQREV=11 VERSION_SEQREV=15
. /usr/local/bin/sequencer.sh . /usr/local/bin/sequencer.sh

View File

@@ -71,15 +71,18 @@ step_4() {
} }
step_5_info() { echo "Show configuration notes"; } step_5_info() { echo "Show configuration notes"; }
step_5_alias() { ALIAS="config"; } step_5_alias() { ALIAS="notes"; }
step_5() { step_5() {
echo -e " [I] Final configuration notes ${toolName}:\n\n" outColor green
echo "$CONFIG_NOTES" cat <<NOTES_END
}
CONFIG_NOTES="# Sample configuration # Sample configuration
https://raw.githubusercontent.com/${repoName}/${toolName}/v${toolVersion}/matterbridge.toml.simple" https://raw.githubusercontent.com/${repoName}/${toolName}/v${toolVersion}/matterbridge.toml.simple"
NOTES_END
}
step_12_info() { step_12_info() {
if [ ! -z $versionNow ] ; then if [ ! -z $versionNow ] ; then
if [ "$toolVersion" == "$versionNow" ] ; then if [ "$toolVersion" == "$versionNow" ] ; then
@@ -115,7 +118,7 @@ step_12() {
versionNow=$([ ! -z $(which ${toolName}) ] && ${toolName} --version | sed 's/.*version: \([0-9.]\+\).*/\1/') versionNow=$([ ! -z $(which ${toolName}) ] && ${toolName} --version | sed 's/.*version: \([0-9.]\+\).*/\1/')
# Sequence Revision # Sequence Revision
VERSION_SEQREV=11 VERSION_SEQREV=15
# Path to sequencer # Path to sequencer
. /usr/local/bin/sequencer.sh . /usr/local/bin/sequencer.sh

View File

@@ -190,5 +190,5 @@ step_102() {
esac esac
} }
VERSION_SEQREV=14 VERSION_SEQREV=15
. /usr/local/bin/sequencer.sh . /usr/local/bin/sequencer.sh