diff --git a/projects/ROCKNIX/packages/network/rclone/package.mk b/projects/ROCKNIX/packages/network/rclone/package.mk index 449587ad47..0c98279878 100644 --- a/projects/ROCKNIX/packages/network/rclone/package.mk +++ b/projects/ROCKNIX/packages/network/rclone/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2021-present Xargon (https://github.com/XargonWan) # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2025 ROCKNIX Team (https://github.com/ROCKNIX) PKG_NAME="rclone" -PKG_VERSION="1.69.1" +PKG_VERSION="1.70.3" PKG_DEPENDS_TARGET="toolchain fuse rsync" PKG_LONGDESC="rsync for cloud storage" PKG_TOOLCHAIN="manual" diff --git a/projects/ROCKNIX/packages/network/rclone/sources/cloud_backup b/projects/ROCKNIX/packages/network/rclone/sources/cloud_backup index 12e6b3ce3f..8fc570b967 100755 --- a/projects/ROCKNIX/packages/network/rclone/sources/cloud_backup +++ b/projects/ROCKNIX/packages/network/rclone/sources/cloud_backup @@ -277,8 +277,8 @@ load_config() { done log_message "Options array has ${#RCLONE_OPTS_ARRAY[@]} elements" "false" - # Create a version without the --delete-excluded flag and without verbose flags - RESTORE_RCLONEOPTS=$(echo "${RCLONEOPTS}" | sed 's/--delete-excluded//' | sed 's/--verbose//' | sed 's/-v//') + # Create a version without the --delete-excluded flag for restore operations + RESTORE_RCLONEOPTS=$(echo "${RCLONEOPTS}" | sed 's/--delete-excluded//') log_message "Configuration loaded successfully" "false" } @@ -375,15 +375,9 @@ backup_game_saves() { log_message "Ensuring remote sync path exists: ${REMOTENAME}${SYNCPATH}" "false" rclone mkdir "${REMOTENAME}${SYNCPATH}" 2>/dev/null - # Set log level to DEBUG when INFO is selected for more verbose logging + # Set log level to DEBUG when INFO is selected for enhanced logging local rclone_debug="" - # Always filter out --verbose and -v to avoid conflicts with --log-level - local filtered_opts=() - for opt in "${RCLONE_OPTS_ARRAY[@]}"; do - if [ "$opt" != "--verbose" ] && [ "$opt" != "-v" ]; then - filtered_opts+=("$opt") - fi - done + local filtered_opts=("${RCLONE_OPTS_ARRAY[@]}") # Add debug logging if LOG_LEVEL is INFO if [ "${LOG_LEVEL}" == "INFO" ]; then @@ -413,7 +407,6 @@ backup_game_saves() { "--exclude=backups/**" "--exclude=bios/**" "--exclude=*.zip" - "--verbose" ) # Execute rclone with enhanced error handling diff --git a/projects/ROCKNIX/packages/network/rclone/sources/cloud_restore b/projects/ROCKNIX/packages/network/rclone/sources/cloud_restore index def1e042d1..ba95deb941 100755 --- a/projects/ROCKNIX/packages/network/rclone/sources/cloud_restore +++ b/projects/ROCKNIX/packages/network/rclone/sources/cloud_restore @@ -344,7 +344,7 @@ load_config() { RCLONE_OPTS_ARRAY+=("$opt") done log_message "Options array has ${#RCLONE_OPTS_ARRAY[@]} elements" "false" - RESTORE_RCLONEOPTS=$(echo "${RCLONEOPTS}" | sed 's/--delete-excluded//' | sed 's/--verbose//' | sed 's/-v//') + RESTORE_RCLONEOPTS=$(echo "${RCLONEOPTS}" | sed 's/--delete-excluded//') log_message "Configuration loaded successfully" "false" } @@ -429,15 +429,9 @@ restore_game_saves() { mkdir -p "${RESTOREPATH}" fi - # Set log level to DEBUG when INFO is selected for more verbose logging + # Set log level to DEBUG when INFO is selected for enhanced logging local rclone_debug="" - # Always filter out --verbose and -v to avoid conflicts with --log-level - local filtered_opts=() - for opt in "${RCLONE_OPTS_ARRAY[@]}"; do - if [ "$opt" != "--verbose" ] && [ "$opt" != "-v" ]; then - filtered_opts+=("$opt") - fi - done + local filtered_opts=("${RCLONE_OPTS_ARRAY[@]}") # Add debug logging if LOG_LEVEL is INFO if [ "${LOG_LEVEL}" == "INFO" ]; then diff --git a/projects/ROCKNIX/packages/network/rclone/sources/rsync.conf b/projects/ROCKNIX/packages/network/rclone/sources/rsync.conf index f35b1c2419..bfee2d3344 100644 --- a/projects/ROCKNIX/packages/network/rclone/sources/rsync.conf +++ b/projects/ROCKNIX/packages/network/rclone/sources/rsync.conf @@ -15,7 +15,7 @@ SYNCPATH="GAMES" BACKUPPATH="/storage/roms" ### This allows changes to the rsync options for cloud_backup -# Options: -r (recursive), -a (archive), -i (itemize changes), -v (verbose) +# Options: -r (recursive), -a (archive), -i (itemize changes) RSYNCOPTSBACKUP="-raiv --prune-empty-dirs" ### This allows changes to the rsync options for cloud_restore