george/blackbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #65 from quarkslab/improve-diff-display

Browse Source 
Modify files loop to improve diff display
This commit is contained in:
Tom Limoncelli
2015-03-23 10:30:40 -04:00
parent ea72a7cd04 cbf0139cf5
commit 08ece7bd60
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bin/blackbox_diff
View File

@@ -18,6 +18,7 @@ fi
prepare_keychain prepare_keychain
modified_files=() modified_files=()
modifications=()
echo '========== DIFFING FILES: START' echo '========== DIFFING FILES: START'
while IFS= read <&99 -r unencrypted_file; do while IFS= read <&99 -r unencrypted_file; do
unencrypted_file=$(get_unencrypted_filename "$unencrypted_file") unencrypted_file=$(get_unencrypted_filename "$unencrypted_file")
@@ -26,12 +27,16 @@ while IFS= read <&99 -r unencrypted_file; do
if [[ -f "$unencrypted_file" ]]; then if [[ -f "$unencrypted_file" ]]; then
out=$(diff -u <(gpg --yes -q --decrypt "$encrypted_file") "$unencrypted_file" || true) out=$(diff -u <(gpg --yes -q --decrypt "$encrypted_file") "$unencrypted_file" || true)
if [ "$out" != "" ]; then if [ "$out" != "" ]; then
echo ========== PROCESSING '"'$unencrypted_file'"'
echo "$out"
modified_files+=("$unencrypted_file") modified_files+=("$unencrypted_file")
modifications+=("$out")
fi fi
fi fi
done 99<"$BB_FILES" done 99<"$BB_FILES"
modified_files_number=${#modified_files[@]}
for (( i=0; i<${modified_files_number}; i++ )); do
echo ========== PROCESSING '"'${modified_files[$i]}'"'
echo -e "${modifications[$i]}\n"
done
echo '========== DIFFING FILES: DONE' echo '========== DIFFING FILES: DONE'
fail_if_keychain_has_secrets fail_if_keychain_has_secrets