From 46ac764399f5799fd2a31ab5bac51c5185b40454 Mon Sep 17 00:00:00 2001
From: Astound <kirito@disroot.org>
Date: Mon, 6 May 2024 09:04:21 +0800
Subject: [PATCH] Fix packages into Hyperbola Milky Way v0.4.4

---
 hyper-bootstrap_v0.4.2.sh | 6 +++---
 hyper-bootstrap_v0.4.3.sh | 8 ++++----
 make-bootstrap-file.sh    | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hyper-bootstrap_v0.4.2.sh b/hyper-bootstrap_v0.4.2.sh
index 1abbf25..eacc020 100644
--- a/hyper-bootstrap_v0.4.2.sh
+++ b/hyper-bootstrap_v0.4.2.sh
@@ -54,16 +54,16 @@ extract_href() {
 }
 
 fetch() {
-    curl -L -s "$@"
+    curl -L -sS --retry 5 "$@"
 }
 
 fetch_file() {
     local FILEPATH=$1
     shift
     if [[ -e "$FILEPATH" ]]; then
-        curl -L -z "$FILEPATH" -o "$FILEPATH" "$@"
+        curl -L --retry 5 -z "$FILEPATH" -o "$FILEPATH" "$@"
     else
-        curl -L -o "$FILEPATH" "$@"
+        curl -L --retry 5 -o "$FILEPATH" "$@"
     fi
 }
 
diff --git a/hyper-bootstrap_v0.4.3.sh b/hyper-bootstrap_v0.4.3.sh
index 7de0b5c..e578ac4 100644
--- a/hyper-bootstrap_v0.4.3.sh
+++ b/hyper-bootstrap_v0.4.3.sh
@@ -71,7 +71,7 @@ pacman
 pacman-mirrorlist
 pcre
 pinentry
-pinentry-curses
+pinentry-tty
 readline
 sed
 shadow
@@ -96,16 +96,16 @@ extract_href() {
 }
 
 fetch() {
-    curl -L -s "$@"
+    curl -L -sS --retry 5 --connect-timeout 10 --max-time 30 "$@"
 }
 
 fetch_file() {
     local FILEPATH=$1
     shift
     if [[ -e "$FILEPATH" ]]; then
-        curl -L -z "$FILEPATH" -o "$FILEPATH" "$@"
+        curl -L --retry 5 --connect-timeout 10 --max-time 30 -z "$FILEPATH" -o "$FILEPATH" "$@"
     else
-        curl -L -o "$FILEPATH" "$@"
+        curl -L --retry 5 --connect-timeout 10 --max-time 30 -o "$FILEPATH" "$@"
     fi
 }
 
diff --git a/make-bootstrap-file.sh b/make-bootstrap-file.sh
index e21ea87..6bab5e4 100644
--- a/make-bootstrap-file.sh
+++ b/make-bootstrap-file.sh
@@ -106,7 +106,7 @@ printf '%b%s%b%s%b\n' '\e[1;32m' '==> ' '\e[0m\033[1m' "Make hyperbola-bootstrap
 (cd ${RESULTPATH} && sha512sum "hyperbola-bootstrap-${ARCH}.tar.gz" >| "hyperbola-bootstrap-${ARCH}.tar.gz.sha512sum")
 
 # Fix permission Tarballs
-(cd ${RESULTPATH} && chown ${TAR_OWNER_USER_ID}:${TAR_OWNER_GROUP_ID} hyperbola-bootstrap-x86_64.tar.gz*)
+(cd ${RESULTPATH} && chown ${TAR_OWNER_USER_ID}:${TAR_OWNER_GROUP_ID} hyperbola-bootstrap-${ARCH}.tar.gz*)
 
 # Clean chroot temp
 case $CHROOT_DELETE in