|
@@ -1,7 +1,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
@@ -17,6 +17,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
@@ -124,8 +125,7 @@ if [ ${confirm} = "Y" ]; then
|
|
|
fi
|
|
|
|
|
|
|
|
|
-
|
|
|
- files_copied_filenam=()
|
|
|
+ files_copied_filename=()
|
|
|
files_copied_total_size=0
|
|
|
files_error_filename=()
|
|
|
|
|
@@ -137,22 +137,30 @@ if [ ${confirm} = "Y" ]; then
|
|
|
|
|
|
file_mdate="$( stat -f %Sm -t %Y-%m-%d "$file" )"
|
|
|
file_size="$( stat -f %z "$file" )"
|
|
|
+
|
|
|
+
|
|
|
+ if [ ${note} = "" ]; then
|
|
|
+ dst_subdir="${file_mdate}"
|
|
|
+ else
|
|
|
+ dst_subdir="${file_mdate}${note}"
|
|
|
+ fi
|
|
|
+
|
|
|
|
|
|
- mkdir -p "$dst"/${file_mdate}
|
|
|
+ mkdir -p "$dst"/"$dst_subdir"
|
|
|
echo "[ $(ts) ]: src file : [${filename}], modification date is: ${file_mdate}, ( $(( ${file_size}/1024/1024 )) MB )"
|
|
|
|
|
|
|
|
|
|
|
|
src_hash=$( shasum -a 256 "$file" | cut -d ' ' -f 1)
|
|
|
|
|
|
- echo "[ $(ts) ]: dst dir: ["$dst"/${file_mdate}]"
|
|
|
+ echo "[ $(ts) ]: dst subdir: ["$dst"/"$dst_subdir"]"
|
|
|
|
|
|
|
|
|
echo "[ $(ts) ] copying.."
|
|
|
- cp "$file" "$dst"/${file_mdate}
|
|
|
+ cp "$file" "$dst"/"$dst_subdir"
|
|
|
|
|
|
|
|
|
- dst_hash=$( shasum -a 256 "${dst}/${file_mdate}/${filename}" | cut -d ' ' -f 1)
|
|
|
+ dst_hash=$( shasum -a 256 "${dst}/"$dst_subdir"/${filename}" | cut -d ' ' -f 1)
|
|
|
|
|
|
|
|
|
|
|
@@ -161,7 +169,7 @@ if [ ${confirm} = "Y" ]; then
|
|
|
files_copied_filename+=("$filename")
|
|
|
files_copied_total_size+=$file_size
|
|
|
|
|
|
-
|
|
|
+
|
|
|
echo "[ $(ts) ]: src and dst hashes are the same, removing src file"
|
|
|
rm "${file}"
|
|
|
else
|
|
@@ -169,23 +177,22 @@ if [ ${confirm} = "Y" ]; then
|
|
|
files_error_filename+=("$file")
|
|
|
fi
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
done
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
@@ -194,6 +201,6 @@ if [ ${confirm} = "Y" ]; then
|
|
|
|
|
|
else
|
|
|
|
|
|
- echo "Operation is not confirmed."
|
|
|
+ echo "[ $(ts) ]: Operation is not confirmed."
|
|
|
exit 1
|
|
|
fi
|