From 48c178ed6b99dc63f426a93ef63567ad24c65964 Mon Sep 17 00:00:00 2001 From: deajan Date: Thu, 26 May 2016 22:34:08 +0200 Subject: [PATCH] Updated ofunctions --- dev/debug_obackup.sh | 28 +++++++++++++++++++++++++++- obackup.sh | 28 +++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dev/debug_obackup.sh b/dev/debug_obackup.sh index 8d01031..61b3ebe 100755 --- a/dev/debug_obackup.sh +++ b/dev/debug_obackup.sh @@ -8,7 +8,7 @@ PROGRAM_VERSION=2.0-RC1 PROGRAM_BUILD=2016052601 IS_STABLE=yes -## FUNC_BUILD=2016052502 +## FUNC_BUILD=2016052602 ## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr ## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode @@ -592,11 +592,37 @@ function IsNumeric { fi } +## from https://gist.github.com/cdown/1163649 +function urlEncode { + local length="${#1}" + + local LANG=C + for (( i = 0; i < length; i++ )); do + local c="${1:i:1}" + case $c in + [a-zA-Z0-9.~_-]) + printf "$c" + ;; + *) + printf '%%%02X' "'$c" + ;; + esac + done +} + +function urlDecode { + local url_encoded="${1//+/ }" + + printf '%b' "${url_encoded//%/\\x}" +} + function CleanUp { __CheckArguments 0 $# ${FUNCNAME[0]} "$@" #__WITH_PARANOIA_DEBUG if [ "$_DEBUG" != "yes" ]; then rm -f "$RUN_DIR/$PROGRAM."*".$SCRIPT_PID" + # Fix for sed -i requiring backup extension for BSD & Mac (see all sed -i statements) + rm -f "$RUN_DIR/$PROGRAM."*".$SCRIPT_PID.tmp" fi } diff --git a/obackup.sh b/obackup.sh index 0c726e8..27d2d63 100755 --- a/obackup.sh +++ b/obackup.sh @@ -8,7 +8,7 @@ PROGRAM_VERSION=2.0-RC1 PROGRAM_BUILD=2016052601 IS_STABLE=yes -## FUNC_BUILD=2016052502 +## FUNC_BUILD=2016052602 ## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr ## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode @@ -578,10 +578,36 @@ function IsNumeric { fi } +## from https://gist.github.com/cdown/1163649 +function urlEncode { + local length="${#1}" + + local LANG=C + for (( i = 0; i < length; i++ )); do + local c="${1:i:1}" + case $c in + [a-zA-Z0-9.~_-]) + printf "$c" + ;; + *) + printf '%%%02X' "'$c" + ;; + esac + done +} + +function urlDecode { + local url_encoded="${1//+/ }" + + printf '%b' "${url_encoded//%/\\x}" +} + function CleanUp { if [ "$_DEBUG" != "yes" ]; then rm -f "$RUN_DIR/$PROGRAM."*".$SCRIPT_PID" + # Fix for sed -i requiring backup extension for BSD & Mac (see all sed -i statements) + rm -f "$RUN_DIR/$PROGRAM."*".$SCRIPT_PID.tmp" fi }