Skip to content

v5.11#8801

Merged
kcondon merged 614 commits intomasterfrom
develop
Jun 13, 2022
Merged

v5.11#8801
kcondon merged 614 commits intomasterfrom
develop

Conversation

@kcondon
Copy link
Contributor

@kcondon kcondon commented Jun 13, 2022

What this PR does / why we need it:

Which issue(s) this PR closes:

Closes #

Special notes for your reviewer:

Suggestions on how to test this:

Does this PR introduce a user interface change? If mockups are available, please link/include them here:

Is there a release notes update needed for this change?:

Additional documentation:

sekmiller and others added 30 commits April 19, 2022 14:22
…onf-file

Added <dataverse_home>/scripts/installer/default.config as the template used in documentation
improve email verification, no popup, auto-verify Shib users
pdurbin and others added 25 commits June 3, 2022 16:20
#165 ensure ordering of MDBs with Citation first
Small grammar edits
Update to v5.11
Update to v5.11
Update to v5.11
@kcondon kcondon self-assigned this Jun 13, 2022
mv apache-maven-3.8.4/* maven/
mv apache-maven-3.8.5/* maven/
echo "export JAVA_HOME=/usr/lib/jvm/jre-openjdk" > maven/maven.sh
echo "export M2_HOME=../maven" >> maven/maven.sh

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[shellcheck] reported by reviewdog 🐶
Consider using { cmd1; cmd2; } >> file instead of individual redirects. SC2129

# PostgresQL credentials:
# edit the following lines so that psql can talk to your database
pg_host=localhost
pg_port=5432

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [shellcheck] reported by reviewdog 🐶
pg_port appears unused. Verify use (or export if used externally). SC2034


echo "Checking the total number of orphan templates in database..."

NUM_TEMPLATES=`${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -tA -F ' ' -c "${PG_QUERY_0}"`

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[shellcheck] reported by reviewdog 🐶
Use $(...) notation instead of legacy backticks .... SC2006

echo "Checking the total number of orphan templates in database..."

NUM_TEMPLATES=`${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -tA -F ' ' -c "${PG_QUERY_0}"`
if [ $? != 0 ]

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[shellcheck] reported by reviewdog 🐶
Check exit code directly with e.g. 'if ! mycmd;', not indirectly with $?. SC2181

exit 1
fi

echo $NUM_TEMPLATES total.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

📝 [shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting. SC2086

then
echo "nothing to do here"
else
curl -X DELETE $SERVER/admin/template/${id}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

📝 [shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting. SC2086


done

NUM_TEMPLATES=`${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -tA -F ' ' -c "${PG_QUERY_0}"`

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[shellcheck] reported by reviewdog 🐶
Use $(...) notation instead of legacy backticks .... SC2006


NUM_TEMPLATES=`${PSQL_EXEC} -h ${pg_host} -U ${pg_user} -d ${pg_db} -tA -F ' ' -c "${PG_QUERY_0}"`

echo $NUM_TEMPLATES orphan templates remaining.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

📝 [shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting. SC2086

@@ -20,19 +20,7 @@ if [ ! -e $UNZIPPED_DIR ]; then
unzip $ZIP_FILE
fi
cd $UNZIPPED_DIR

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [shellcheck] reported by reviewdog 🐶
Use 'cd ... || exit' or 'cd ... || return' in case cd fails. SC2164

echo "Installation of the GeoLite2 country database for counter-processor can no longer be automated. See the Installation Guide for the manual installation process."
pip3 install -r requirements.txt
# For now, parsing sample_logs/counter_2018-05-08.log
for i in `echo {00..31}`; do

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[shellcheck] reported by reviewdog 🐶
Use $(...) notation instead of legacy backticks .... SC2006

@kcondon kcondon merged commit 21ac7e1 into master Jun 13, 2022
@coveralls
Copy link

Coverage Status

Coverage increased (+0.8%) to 19.71% when pulling 4686066 on develop into b844672 on master.

@pdurbin pdurbin added this to the 5.11 milestone Jun 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.