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

Merge pull request #1739 from maxengel/verbose-flag-fix

Browse Source 
Update rclone package version and refine backup/restore scripts
This commit is contained in:
r3claimer
2025-08-06 05:41:18 -07:00
committed by GitHub
parent cd50aee53a 3290486295
commit 129f6d7809
4 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
projects/ROCKNIX/packages/network/rclone/package.mk
View File

@@ -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"

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

@@ -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

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

@@ -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

2
projects/ROCKNIX/packages/network/rclone/sources/rsync.conf
View File

@@ -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