Add .editorconfig and correct indentation for many seqs

This commit is contained in:
2022-03-14 21:27:29 +01:00
parent bb8b54597a
commit 71612aef94
34 changed files with 178 additions and 164 deletions

6
.editorconfig Normal file
View File

@@ -0,0 +1,6 @@
root = true
[*.{sh,cfg,example}]
charset = utf-8
indent_style = space
indent_size = 2

View File

@@ -53,7 +53,8 @@ step_3() {
exe adduser --system $DLD_USER --group --home "${DLD_CONFDIR}" exe adduser --system $DLD_USER --group --home "${DLD_CONFDIR}"
} }
step_4_info() { echo "Install sonarr" step_4_info() {
echo "Install sonarr"
echoinfo "Default port: 8989" echoinfo "Default port: 8989"
} }
step_4() { step_4() {

View File

@@ -26,7 +26,7 @@ step_1() {
exe apt install gnupg2 git lsb-release ssl-cert ca-certificates apt-transport-https \ exe apt install gnupg2 git lsb-release ssl-cert ca-certificates apt-transport-https \
tree locate software-properties-common dirmngr screen htop nano net-tools zip unzip \ tree locate software-properties-common dirmngr screen htop nano net-tools zip unzip \
curl ffmpeg ghostscript libfile-fcntllock-perl curl socat curl ffmpeg ghostscript libfile-fcntllock-perl curl socat
} }
step_2_info() { echo "Add universe and official nginx apt repositories"; } step_2_info() { echo "Add universe and official nginx apt repositories"; }
step_2() { step_2() {

View File

@@ -154,7 +154,8 @@ SyslogIdentifier=synapse
[Install] [Install]
WantedBy=multi-user.target" WantedBy=multi-user.target"
step_10_info() { echo -n "Upgrade $toolName installation" step_10_info() {
echo -n "Upgrade $toolName installation"
if [ $CONTEXT_HELP -eq 0 ] ; then if [ $CONTEXT_HELP -eq 0 ] ; then
echo " at $MATRIX_HOME" echo " at $MATRIX_HOME"
else else

View File

@@ -82,8 +82,10 @@ listen 80 default_server;
include ${snippetLetsencryptLoc}; include ${snippetLetsencryptLoc};
}" }"
step_4_info() { echo "Installation of $phpName packages:" step_4_info() {
echoinfo "$phpPackages"; } echo "Installation of $phpName packages:"
echoinfo "$phpPackages"
}
step_4_alias() { ALIAS="php"; } step_4_alias() { ALIAS="php"; }
step_4() { step_4() {
exe apt install $(eval echo $phpPackages) $aptOpt exe apt install $(eval echo $phpPackages) $aptOpt

View File

@@ -6,8 +6,10 @@ phpVersion="7.3"
phpName="php$phpVersion" phpName="php$phpVersion"
phpPackages="${phpName}-fpm ${phpName}-json ${phpName}-mysql ${phpName}-curl ${phpName}-intl ${phpName}-gd ${phpName}-zip ${phpName}-xml ${phpName}-mbstring php-imagick php-apcu" phpPackages="${phpName}-fpm ${phpName}-json ${phpName}-mysql ${phpName}-curl ${phpName}-intl ${phpName}-gd ${phpName}-zip ${phpName}-xml ${phpName}-mbstring php-imagick php-apcu"
step_1_info() { echo "Installation of $serverName packages:" step_1_info() {
echoinfo "$serverPackages"; } echo "Installation of $serverName packages:"
echoinfo "$serverPackages"
}
step_1_alias() { ALIAS="install"; } step_1_alias() { ALIAS="install"; }
step_1() { step_1() {
exe apt update exe apt update
@@ -50,8 +52,10 @@ siteDefaultIp4="server {
include ${snippetLetsencryptLoc}; include ${snippetLetsencryptLoc};
}" }"
step_3_info() { echo "Installation of $phpName packages:" step_3_info() {
echoinfo "$phpPackages"; } echo "Installation of $phpName packages:"
echoinfo "$phpPackages"
}
step_3() { step_3() {
exe apt install $phpPackages exe apt install $phpPackages
endReturn -o $? "$phpName error during startup" endReturn -o $? "$phpName error during startup"

View File

@@ -13,14 +13,14 @@ CONFIG_FILE_NAME="${toolName}.cfg"
CONFIG_FILE_TEMPLATE="$WDIR/${CONFIG_FILE_NAME}.example" CONFIG_FILE_TEMPLATE="$WDIR/${CONFIG_FILE_NAME}.example"
#step_config() { #step_config() {
#echo "Called once before executing steps." #echo "Called once before executing steps."
## e.g. to source a config file manually: ## e.g. to source a config file manually:
#. "$CONFIG_FILE" #. "$CONFIG_FILE"
## or to use sequencer api: ## or to use sequencer api:
#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
#fi #fi
#} #}
step_1_info() { echo "Prepare installation of $toolName"; } step_1_info() { echo "Prepare installation of $toolName"; }