diff --git a/fireflyiii_data_importer/rootfs/etc/cont-init.d/99-run.sh b/fireflyiii_data_importer/rootfs/etc/cont-init.d/99-run.sh index af03bdea6f..1cfc4a416a 100755 --- a/fireflyiii_data_importer/rootfs/etc/cont-init.d/99-run.sh +++ b/fireflyiii_data_importer/rootfs/etc/cont-init.d/99-run.sh @@ -27,6 +27,10 @@ export CAN_POST_FILES="$(bashio::config "CAN_POST_FILES")" export CAN_POST_AUTOIMPORT="$(bashio::config "CAN_POST_AUTOIMPORT")" # Persist variables to /etc/environment for cron jobs +SILENT_MODE="false" +if bashio::config.true 'silent'; then + SILENT_MODE="true" +fi { [ -n "$JSON_CONFIGURATION_DIR" ] && echo "JSON_CONFIGURATION_DIR=\"$JSON_CONFIGURATION_DIR\"" echo "CONFIG_LOCATION=\"$CONFIGSOURCE\"" @@ -35,8 +39,9 @@ export CAN_POST_AUTOIMPORT="$(bashio::config "CAN_POST_AUTOIMPORT")" echo "AUTO_IMPORT_SECRET=\"$AUTO_IMPORT_SECRET\"" echo "CAN_POST_FILES=\"$CAN_POST_FILES\"" echo "CAN_POST_AUTOIMPORT=\"$CAN_POST_AUTOIMPORT\"" + echo "SILENT_MODE=\"$SILENT_MODE\"" } >> /etc/environment -chmod 600 /etc/environment +chmod 644 /etc/environment ################ # CRON OPTIONS # @@ -54,9 +59,6 @@ if bashio::config.has_value 'Updates'; then cp /templates/cronupdate /etc/cron."${FREQUENCY}"/ chmod 755 /etc/cron."${FREQUENCY}"/cronupdate - # Sets cron to run with www-data user - sed -i 's|root|www-data|g' /etc/crontab - # Starts cron service cron start diff --git a/fireflyiii_data_importer/rootfs/templates/cronupdate b/fireflyiii_data_importer/rootfs/templates/cronupdate index b4769c1cb4..494d55a945 100644 --- a/fireflyiii_data_importer/rootfs/templates/cronupdate +++ b/fireflyiii_data_importer/rootfs/templates/cronupdate @@ -1,18 +1,20 @@ -#!/usr/bin/env bashio +#!/bin/bash # shellcheck shell=bash set -e # Source environment variables for cron context # shellcheck disable=SC1091 if [ -f /etc/environment ]; then set -a; . /etc/environment; set +a; fi +# shellcheck disable=SC1091 +if [ -f /.env ]; then set -a; . /.env; set +a; fi # Use persisted value instead of calling bashio::config (www-data may lack API access) CONFIGSOURCE="${CONFIG_LOCATION}" ( -bashio::log.info "Running update according to defined schedule. Files located in $CONFIGSOURCE/import_files will be imported. If /config, it is accessible in the folder /addon_configs/xxx-firefly_data_importer when using the Filebrowser addon" -if bashio::config.true 'silent'; then - bashio::log.warning "Silent mode activated. Only errors will be shown. Please disable in addon options if you need to debug" +echo "[INFO] Running update according to defined schedule. Files located in $CONFIGSOURCE/import_files will be imported." +if [ "${SILENT_MODE}" = "true" ]; then + echo "[WARNING] Silent mode activated. Only errors will be shown. Please disable in addon options if you need to debug" /usr/local/bin/php /var/www/html/artisan importer:auto-import "$CONFIGSOURCE/import_files" >/dev/null else /usr/local/bin/php /var/www/html/artisan importer:auto-import "$CONFIGSOURCE/import_files"