vrr/ipregion
2
0
Fork 0
mirror of https://github.com/vernette/ipregion.git synced 2026-07-10 00:08:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(ipregion): enhance trap handling for spinner

Browse source
This commit is contained in:
Nikita Skryabin 2025-09-19 16:42:23 +03:00
parent a2da1b4063
commit 560abc3ef2
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ipregion.sh
View file

@ -927,6 +927,11 @@ spinner_update() {
fi
}
spinner_cleanup() {
spinner_stop
exit 130
}
make_request() {
local method="$1"
local url="$2"
@ -1828,6 +1833,8 @@ main() {
setup_debug
trap spinner_cleanup EXIT INT TERM
detect_distro
install_dependencies
@ -1840,8 +1847,7 @@ main() {
discover_external_ips
get_asn
if [[ "$JSON_OUTPUT" != true && "$VERBOSE" != true ]]; then
trap spinner_stop EXIT INT TERM
if [[ "$JSON_OUTPUT" != "true" && "$VERBOSE" != "true" ]]; then
spinner_start
fi
@ -1862,14 +1868,15 @@ main() {
;;
esac
if [[ "$JSON_OUTPUT" != true && "$VERBOSE" != true ]]; then
if [[ "$JSON_OUTPUT" != "true" && "$VERBOSE" != "true" ]]; then
spinner_stop
trap - EXIT INT TERM
fi
print_results
cleanup_debug
trap - EXIT INT TERM
}
main "$@"