Skip to content

Commit

Permalink
Preserve original commands order when merging
Browse files Browse the repository at this point in the history
  • Loading branch information
vitobotta committed Oct 20, 2023
1 parent f73967c commit 6b69550
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sync-history.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ if (( current_time - last_executed_time >= 15 )) || [ "$force_sync" = "-f" ]; th
fi

source_items=$(read_file $source_file)
items=$(echo -e "$source_items\n$new_items" | grep -v '^\:\s[<=>]\{3\}' | sort | uniq)
items=$(echo -e "$source_items\n$new_items" | grep -v '^\:\s[<=>]\{3\}' | awk '!x[$0]++')

echo -e "$items" > $source_file
echo -e "$items" | openssl enc -aes-256-cbc -md sha256 -out "$sync_file" -pass file:"$encryption_key_file" -pbkdf2
Expand Down

0 comments on commit 6b69550

Please sign in to comment.