From c548479c6d9d00e5e21c531e3c60668005602e62 Mon Sep 17 00:00:00 2001 From: Dalibor Pospisil Date: Thu, 19 Jun 2014 12:04:46 +0200 Subject: [PATCH 06/14] __INTERNAL_FILEBACKUP_SET_PATH_CLEAN, __INTERNAL_FILEBACKUP_CLEAN_PATHS: use hex hash instead of base64 - fixes problems with case sensitivity --- src/infrastructure.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/infrastructure.sh b/src/infrastructure.sh index 53d7c27..9c1dfbb 100644 --- a/src/infrastructure.sh +++ b/src/infrastructure.sh @@ -478,10 +478,10 @@ __INTERNAL_FILEBACKUP_NAMESPACE="rlFileBackupNamespace" __INTERNAL_FILEBACKUP_SET_PATH_CLEAN() { local path="$1" - local path_encoded="$( rlHash "$1" )" + local path_encoded="$( rlHash -a hex "$1" )" local namespace="$2" - local namespace_encoded="$( rlHash "$2" )" + local namespace_encoded="$( rlHash -a hex "$2" )" rlLogDebug "rlFileBackup: Setting up the cleaning lists" rlLogDebug "rlFileBackup: Path [$path] Encoded [$path_encoded]" @@ -499,7 +499,7 @@ __INTERNAL_FILEBACKUP_SET_PATH_CLEAN() { __INTERNAL_FILEBACKUP_CLEAN_PATHS() { local namespace="$1" - local namespace_encoded="$( rlHash "$1" )" + local namespace_encoded="$( rlHash -a hex "$1" )" rlLogDebug "rlFileRestore: Fetching clean-up lists for namespace: [$namespace] (encoded as [$namespace_encoded])" @@ -510,7 +510,7 @@ __INTERNAL_FILEBACKUP_CLEAN_PATHS() { local path for path in $PATHS do - local path_decoded="$( rlUnhash "$path" )" + local path_decoded="$( rlUnhash -a hex "$path" )" if rm -rf "$path_decoded"; then rlLogDebug "rlFileRestore: Cleaning $path_decoded successful" -- 1.9.3