From 54eedb9d1abcfc644a072c89dc1d6d2d589a3eb4 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Tue, 6 Sep 2016 22:48:14 -0400 Subject: [PATCH] took off training wheels by hiding debug output and added more comments. --- scripts/files/compare_dirs.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/files/compare_dirs.sh b/scripts/files/compare_dirs.sh index cb538205..6c700d8f 100644 --- a/scripts/files/compare_dirs.sh +++ b/scripts/files/compare_dirs.sh @@ -24,28 +24,23 @@ out1="$(mktemp "$TMP/compare_dirs_output.XXXXXX")" out2="$(mktemp "$TMP/compare_dirs_output.XXXXXX")" +#hmmm: need error checking in here!!!! -#hmmm: need error checking here!!!! - - - - - +# host processing on first dir. if [[ $dir1 == *":"* ]]; then - # host processing on first dir. host1=${dir1%:*} dir1=${dir1#*:} -echo "got host1 as $host1" -echo "got new dir1 as $dir1" +#echo "got host1 as $host1 and new dir1 as $dir1" fi + +# host processing on second dir. if [[ $dir2 == *":"* ]]; then - # host processing on second dir. host2=${dir2%:*} dir2=${dir2#*:} -echo "got host2 as $host2" -echo "got new dir2 as $dir2" +#echo "got host2 as $host2 and new dir2 as $dir2" fi + if [ -z "$host1" ]; then # fully local compare location for first dir. pushd "$dir1" &>/dev/null @@ -55,7 +50,8 @@ else # remote compare location for first dir. ssh "$host1" "cd \"$dir1\" && find ." >"$out1" fi -# sort the output from that find. + +# sort the output from listing the first directory. sort "$out1" >"$out1".sort if [ -z "$host2" ]; then @@ -67,9 +63,13 @@ else # remote compare location for second dir. ssh "$host2" "cd \"$dir2\" && find ." >"$out2" fi + +# sort the output from listing the second directory. sort "$out2" >"$out2".sort +# compare the two sorted output files to show the missing files on each side. diff "$out1".sort "$out2".sort +# clean up our output files. rm "$out1" "$out1".sort "$out2" "$out2".sort -- 2.34.1