Skip to content

Fix and simplify the diff logic #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lykhvar merged 1 commit into from
Jul 24, 2025
Merged

Fix and simplify the diff logic #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions vet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ EOF
# shellcheck disable=SC2317
cleanup() {
[ -n "${TMPFILE:-}" ] && [ -f "${TMPFILE}" ] && rm -f "${TMPFILE}"
[ -n "${TMPFILE_DIFF:-}" ] && [ -f "${TMPFILE_DIFF}" ] && rm -f "${TMPFILE_DIFF}"
}

check_dependencies() {
Expand Down Expand Up @@ -102,6 +103,7 @@ check_dependencies

mkdir -p "$CACHE_DIR"
TMPFILE=$(mktemp) || { log_error "Failed to create temporary file."; exit 1; }
TMPFILE_DIFF=$(mktemp) || { log_error "Failed to create temporary diff file."; exit 1; }

log_info "Downloading script from: $URL"
if ! "${DOWNLOAD_CMD[@]}" "$TMPFILE" "$URL"; then
Expand All @@ -128,16 +130,15 @@ CACHE_FILE_ID=$(echo -n "$URL" | sha256sum | awk '{print $1}')
CACHE_FILE_PATH="${CACHE_DIR}/${CACHE_FILE_ID}.sh"

if [ -f "$CACHE_FILE_PATH" ]; then
OLD_HASH=$(sha256sum "$CACHE_FILE_PATH" | awk '{print $1}')
NEW_HASH=$(sha256sum "$TMPFILE" | awk '{print $1}')

if [ "$OLD_HASH" == "$NEW_HASH" ]; then
if diff -u "$CACHE_FILE_PATH" "$TMPFILE" > "$TMPFILE_DIFF"; then
log_ok "No changes detected since last run."
elif [ "$FORCE_MODE" -eq 0 ]; then
log_warn "Script has CHANGED since the last run."
printf "[?] %sShow diff?%s [y/N] " "$C_BOLD" "$C_RESET"
read -n 1 -r REPLY; echo
diff -u "$CACHE_FILE_PATH" "$TMPFILE" | less
if [[ "$REPLY" =~ ^[Yy]$ ]]; then
less "$TMPFILE_DIFF"
fi
fi
fi

Expand Down
Loading