Skip to content

Commit 5b3df8b

Browse files
committed
functions: Refactor to using execute_raketask helper
1 parent 9a12043 commit 5b3df8b

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

assets/runtime/functions

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1107,7 +1107,7 @@ migrate_database() {
11071107
if [[ ${REDMINE_VERSION} != ${CACHE_VERSION} ]]; then
11081108
if [[ "${DB_CREATE}" == "true" ]] ; then
11091109
echo "Creating database..."
1110-
if ! exec_as_redmine bundle exec rake db:create >/dev/null
1110+
if ! execute_raketask db:create >/dev/null
11111111
then
11121112
cat <<-EOM
11131113
Failed to create db. If db exists, and user (or role) exists and has access to db but no permission to create databases, set:
@@ -1120,11 +1120,11 @@ EOM
11201120
fi
11211121

11221122
echo "Migrating database. Please be patient, this could take a while..."
1123-
exec_as_redmine bundle exec rake db:migrate >/dev/null
1123+
execute_raketask db:migrate >/dev/null
11241124

11251125
# clear sessions and application cache
1126-
exec_as_redmine bundle exec rake tmp:cache:clear >/dev/null
1127-
exec_as_redmine bundle exec rake tmp:sockets:clear >/dev/null
1126+
execute_raketask tmp:cache:clear >/dev/null
1127+
execute_raketask tmp:sockets:clear >/dev/null
11281128

11291129
# Now that database has been migrated, update version file
11301130
echo ${REDMINE_VERSION} | exec_as_redmine tee --append ${REDMINE_DATA_DIR}/tmp/VERSION >/dev/null
@@ -1165,7 +1165,7 @@ install_plugins() {
11651165
exec_as_redmine bundle install -j"$(nproc)" --quiet
11661166

11671167
echo "Migrating plugins. Please be patient, this could take a while..."
1168-
exec_as_redmine bundle exec rake redmine:plugins:migrate
1168+
execute_raketask redmine:plugins:migrate
11691169

11701170
# save SHA1
11711171
echo -n ${PLUGINS_SHA1} > ${REDMINE_DATA_DIR}/tmp/plugins.sha1

0 commit comments

Comments
 (0)