psi-jack/yadm
1
0
Fork 0
mirror of synced 2024-12-22 06:31:07 -05:00
Code Issues Releases Wiki Activity

Process .yadm/encrypt in sorted order

Browse source
This commit is contained in:
Tim Byrne 2019-03-24 17:05:11 -05:00
parent 2848ca2d1d
commit 58edf313aa
No known key found for this signature in database
GPG key ID: 14DB4FC2465A4B12
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
test/test_unit_parse_encrypt.py
View file

@ -140,6 +140,10 @@ def test_file_parse_encrypt(runner, paths):
for expected_file in expected: for expected_file in expected:
assert f'EIF:{expected_file}\n' in run.out assert f'EIF:{expected_file}\n' in run.out
sorted_expectations = '\n'.join(
[f'EIF:{exp}' for exp in sorted(expected)])
assert sorted_expectations in run.out
def run_parse_encrypt( def run_parse_encrypt(
runner, paths, runner, paths,
@ -162,6 +166,7 @@ def run_parse_encrypt(
export YADM_ENCRYPT export YADM_ENCRYPT
GIT_DIR={paths.repo} GIT_DIR={paths.repo}
export GIT_DIR export GIT_DIR
LC_ALL=C
{parse_cmd} {parse_cmd}
export ENCRYPT_INCLUDE_FILES export ENCRYPT_INCLUDE_FILES
export PARSE_ENCRYPT_SHORT export PARSE_ENCRYPT_SHORT

6
yadm
View file

@ -956,7 +956,11 @@ function parse_encrypt() {
done done
[ -n "$skip" ] || FINAL_INCLUDE+=("$included") [ -n "$skip" ] || FINAL_INCLUDE+=("$included")
done done
ENCRYPT_INCLUDE_FILES=("${FINAL_INCLUDE[@]}")
#; sort the encrypted files
#shellcheck disable=SC2207
IFS=$'\n' ENCRYPT_INCLUDE_FILES=($(sort <<<"${FINAL_INCLUDE[*]}"))
unset IFS
fi fi
} }