Merge remote-tracking branch 'origin/master'
This commit is contained in:
Executable → Regular
+5
-8
@@ -10,8 +10,7 @@ fn_log_info() { echo "$APPNAME: $1"; }
|
||||
fn_log_warn() { echo "$APPNAME: [WARNING] $1" 1>&2; }
|
||||
fn_log_error() { echo "$APPNAME: [ERROR] $1" 1>&2; }
|
||||
fn_log_info_cmd() {
|
||||
if [ -n "$SSH_CMD" ]
|
||||
then
|
||||
if [ -n "$SSH_CMD" ]; then
|
||||
echo "$APPNAME: $SSH_CMD '$1'";
|
||||
else
|
||||
echo "$APPNAME: $1";
|
||||
@@ -58,8 +57,7 @@ fn_expire_backup() {
|
||||
}
|
||||
|
||||
fn_parse_ssh() {
|
||||
if [[ "$DEST_FOLDER" =~ ^[A-Za-z0-9\._%\+\-]+@[A-Za-z0-9.\-]+\:.+$ ]]
|
||||
then
|
||||
if [[ "$DEST_FOLDER" =~ ^[A-Za-z0-9\._%\+\-]+@[A-Za-z0-9.\-]+\:.+$ ]]; then
|
||||
SSH_USER=$(echo "$DEST_FOLDER" | sed -E 's/^([A-Za-z0-9\._%\+\-]+)@([A-Za-z0-9.\-]+)\:(.+)$/\1/')
|
||||
SSH_HOST=$(echo "$DEST_FOLDER" | sed -E 's/^([A-Za-z0-9\._%\+\-]+)@([A-Za-z0-9.\-]+)\:(.+)$/\2/')
|
||||
SSH_DEST_FOLDER=$(echo "$DEST_FOLDER" | sed -E 's/^([A-Za-z0-9\._%\+\-]+)@([A-Za-z0-9.\-]+)\:(.+)$/\3/')
|
||||
@@ -69,8 +67,7 @@ fn_parse_ssh() {
|
||||
}
|
||||
|
||||
fn_run_cmd() {
|
||||
if [ -n "$SSH_CMD" ]
|
||||
then
|
||||
if [ -n "$SSH_CMD" ]; then
|
||||
eval "$SSH_CMD '$1'"
|
||||
else
|
||||
eval $1
|
||||
@@ -152,8 +149,8 @@ fi
|
||||
# Date logic
|
||||
NOW=$(date +"%Y-%m-%d-%H%M%S")
|
||||
EPOCH=$(date "+%s")
|
||||
KEEP_ALL_DATE=$(($EPOCH - 86400)) # 1 day ago
|
||||
KEEP_DAILIES_DATE=$(($EPOCH - 2678400)) # 31 days ago
|
||||
KEEP_ALL_DATE=$((EPOCH - 86400)) # 1 day ago
|
||||
KEEP_DAILIES_DATE=$((EPOCH - 2678400)) # 31 days ago
|
||||
|
||||
export IFS=$'\n' # Better for handling spaces in filenames.
|
||||
PROFILE_FOLDER="$HOME/.$APPNAME"
|
||||
|
||||
Reference in New Issue
Block a user