archr/Arch-R
0
0
Fork 0
mirror of https://github.com/archr-linux/Arch-R.git synced 2026-03-31 14:41:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix rclone --verbose conflict: complete PR #1747 by fixing cloud_sync_helper path

Browse Source 
PR #1747 only fixed the post-update fallback path, but most users hit
the cloud_sync_helper path which was never updated. This completes the
fix by:

1. Adding verbose flag removal to cloud_sync_helper (primary update path)
2. Adding runtime filtering to cloud_backup and cloud_restore scripts

The --verbose/-v flags conflict with --log-level in rclone. Now all
code paths properly remove these conflicting flags.

Fixes: Incomplete fix from PR #1747
This commit is contained in:
Max Engel
2025-10-16 18:48:21 -04:00
parent 13e9a642c4
commit d1c3ed5678
3 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
projects/ROCKNIX/packages/network/rclone/sources/cloud_backup
View File

@@ -266,10 +266,18 @@ load_config() {
RCLONEOPTS=$(echo "${RCLONEOPTS}" | tr '\n\\' ' ' | tr -s ' ')
log_message "After newline cleanup: ${RCLONEOPTS}" "false"
# Remove conflicting --verbose and -v flags that conflict with --log-level
RCLONEOPTS=$(echo "${RCLONEOPTS}" | sed 's/--verbose//g' | sed 's/-v / /g')
log_message "After removing verbose flags: ${RCLONEOPTS}" "false"
# Ensure each option starts with a space (except the first one)
RCLONEOPTS=$(echo "${RCLONEOPTS}" | sed 's/--/ --/g' | sed 's/^ //')
log_message "After spacing fix: ${RCLONEOPTS}" "false"
# Clean up any double spaces left by removal
RCLONEOPTS=$(echo "${RCLONEOPTS}" | tr -s ' ')
log_message "After final cleanup: ${RCLONEOPTS}" "false"
# Convert to array to ensure proper word splitting
RCLONE_OPTS_ARRAY=()
for opt in ${RCLONEOPTS}; do

10
projects/ROCKNIX/packages/network/rclone/sources/cloud_restore
View File

@@ -337,8 +337,18 @@ load_config() {
log_message "Original RCLONEOPTS: ${RCLONEOPTS}" "false"
RCLONEOPTS=$(echo "${RCLONEOPTS}" | tr '\n\\' ' ' | tr -s ' ')
log_message "After newline cleanup: ${RCLONEOPTS}" "false"
# Remove conflicting --verbose and -v flags that conflict with --log-level
RCLONEOPTS=$(echo "${RCLONEOPTS}" | sed 's/--verbose//g' | sed 's/-v / /g')
log_message "After removing verbose flags: ${RCLONEOPTS}" "false"
RCLONEOPTS=$(echo "${RCLONEOPTS}" | sed 's/--/ --/g' | sed 's/^ //')
log_message "After spacing fix: ${RCLONEOPTS}" "false"
# Clean up any double spaces left by removal
RCLONEOPTS=$(echo "${RCLONEOPTS}" | tr -s ' ')
log_message "After final cleanup: ${RCLONEOPTS}" "false"
RCLONE_OPTS_ARRAY=()
for opt in ${RCLONEOPTS}; do
RCLONE_OPTS_ARRAY+=("$opt")

11
projects/ROCKNIX/packages/network/rclone/sources/cloud_sync_helper
View File

@@ -154,6 +154,17 @@ main() {
update_cloud_sync_rules "${log_file}"
update_cloud_sync_config "${log_file}"
# Remove conflicting --verbose flags from existing user config to prevent parameter conflicts
# This is needed for users upgrading from older versions where --verbose was used
if [ -f "/storage/.config/cloud_sync.conf" ]; then
log_to_file "${log_file}" "Removing conflicting --verbose flags from configuration"
sed -i 's/--verbose//g' /storage/.config/cloud_sync.conf
sed -i 's/-v / /g' /storage/.config/cloud_sync.conf
# Clean up any double spaces left by removal
sed -i 's/ \+/ /g' /storage/.config/cloud_sync.conf
log_to_file "${log_file}" "Configuration cleaned of conflicting flags"
fi
return 0
}