🔨 Added slight pause to error-retry loop

This commit is contained in:
Geoff Murphy 2025-05-14 13:49:01 +10:00
parent f40fa533a6
commit cb37a47414
2 changed files with 9 additions and 3 deletions

View file

@ -69,6 +69,7 @@ if [ "$FAKE_DEP" != "" ]; then
while ! eval "$CMD"; do while ! eval "$CMD"; do
INDEX=$(( INDEX + 1 )) INDEX=$(( INDEX + 1 ))
echo "[ERROR] Retrying: Attempt $INDEX..." echo "[ERROR] Retrying: Attempt $INDEX..."
sleep 1
done done
fi fi
fi fi

View file

@ -37,7 +37,6 @@ VARS=$(echo "$@" | sed -e 's/[^ ]* *//')
# └───────────────────────────────────────┘ # └───────────────────────────────────────┘
_fake_update () { _fake_update () {
echo "[UPDATE] $(date)" >> $FAKE_LOG echo "[UPDATE] $(date)" >> $FAKE_LOG
echo ""
if [ "$(command -v paru)" ]; then CMD="$FAKE_BTL paru --noconfirm -Syyy && $FAKE_BTL paru --noconfirm -Syu" if [ "$(command -v paru)" ]; then CMD="$FAKE_BTL paru --noconfirm -Syyy && $FAKE_BTL paru --noconfirm -Syu"
elif [ "$(command -v pacman)" ]; then CMD="$FAKE_SUDO pacman --noconfirm -Syyy && $FAKE_SUDO pacman --noconfirm -Syu" elif [ "$(command -v pacman)" ]; then CMD="$FAKE_SUDO pacman --noconfirm -Syyy && $FAKE_SUDO pacman --noconfirm -Syu"
elif [ "$(command -v apt)" ]; then CMD="$FAKE_SUDO apt -y update && $FAKE_SUDO apt -y upgrade" elif [ "$(command -v apt)" ]; then CMD="$FAKE_SUDO apt -y update && $FAKE_SUDO apt -y upgrade"
@ -45,6 +44,7 @@ _fake_update () {
elif [ "$(command -v dnf)" ]; then CMD="$FAKE_SUDO dnf -y update && $FAKE_SUDO apt -y upgrade" elif [ "$(command -v dnf)" ]; then CMD="$FAKE_SUDO dnf -y update && $FAKE_SUDO apt -y upgrade"
else CMD="echo '[ERROR] Incompatable System...'"; fi else CMD="echo '[ERROR] Incompatable System...'"; fi
INDEX=1 INDEX=1
echo ""
echo "[FAKE//OS] Update: $CMD" echo "[FAKE//OS] Update: $CMD"
echo "" echo ""
if ! eval "$CMD 2>> $FAKE_LOG"; then if ! eval "$CMD 2>> $FAKE_LOG"; then
@ -52,6 +52,7 @@ _fake_update () {
INDEX=$(( INDEX + 1 )) INDEX=$(( INDEX + 1 ))
echo "" echo ""
echo "[ERROR] Retrying: Attempt $INDEX..." echo "[ERROR] Retrying: Attempt $INDEX..."
sleep 1
done done
fi fi
echo "[UPDATE] ----> Completed in $INDEX attempt(s)" >> $FAKE_LOG echo "[UPDATE] ----> Completed in $INDEX attempt(s)" >> $FAKE_LOG
@ -64,7 +65,6 @@ _fake_update () {
# └───────────────────────────────────────┘ # └───────────────────────────────────────┘
_fake_install () { _fake_install () {
echo "[INSTALL] $@" >> $FAKE_LOG echo "[INSTALL] $@" >> $FAKE_LOG
echo ""
if [ "$(command -v paru)" ]; then CMD="$FAKE_BTL paru --noconfirm -S $@" if [ "$(command -v paru)" ]; then CMD="$FAKE_BTL paru --noconfirm -S $@"
elif [ "$(command -v pacman)" ]; then CMD="$FAKE_SUDO pacman --noconfirm -S $@" elif [ "$(command -v pacman)" ]; then CMD="$FAKE_SUDO pacman --noconfirm -S $@"
elif [ "$(command -v apt)" ]; then CMD="$FAKE_SUDO apt -y install $@" elif [ "$(command -v apt)" ]; then CMD="$FAKE_SUDO apt -y install $@"
@ -72,6 +72,7 @@ _fake_install () {
elif [ "$(command -v dnf)" ]; then CMD="$FAKE_SUDO dnf -y install $@" elif [ "$(command -v dnf)" ]; then CMD="$FAKE_SUDO dnf -y install $@"
else CMD="echo '[ERROR] Incompatable System...'"; fi else CMD="echo '[ERROR] Incompatable System...'"; fi
INDEX=1 INDEX=1
echo ""
echo "[FAKE//OS] Install: $@" echo "[FAKE//OS] Install: $@"
echo "" echo ""
if ! eval "$CMD 2>> $FAKE_LOG"; then if ! eval "$CMD 2>> $FAKE_LOG"; then
@ -79,6 +80,7 @@ _fake_install () {
INDEX=$(( INDEX + 1 )) INDEX=$(( INDEX + 1 ))
echo "" echo ""
echo "[ERROR] Retrying: Attempt $INDEX..." echo "[ERROR] Retrying: Attempt $INDEX..."
sleep 1
done done
fi fi
echo "[INSTALL] ----> Completed in $INDEX attempt(s)" >> $FAKE_LOG echo "[INSTALL] ----> Completed in $INDEX attempt(s)" >> $FAKE_LOG
@ -90,7 +92,6 @@ _fake_install () {
# └───────────────────────────────────────┘ # └───────────────────────────────────────┘
_fake_remove () { _fake_remove () {
echo "[REMOVE] $@" >> $FAKE_LOG echo "[REMOVE] $@" >> $FAKE_LOG
echo ""
if [ "$(command -v paru)" ]; then CMD="$FAKE_BTL paru --noconfirm -R $@" if [ "$(command -v paru)" ]; then CMD="$FAKE_BTL paru --noconfirm -R $@"
elif [ "$(command -v pacman)" ]; then CMD="$FAKE_SUDO pacman --noconfirm -R $@" elif [ "$(command -v pacman)" ]; then CMD="$FAKE_SUDO pacman --noconfirm -R $@"
elif [ "$(command -v apt)" ]; then CMD="$FAKE_SUDO apt -y remove $@" elif [ "$(command -v apt)" ]; then CMD="$FAKE_SUDO apt -y remove $@"
@ -98,6 +99,7 @@ _fake_remove () {
elif [ "$(command -v dnf)" ]; then CMD="$FAKE_SUDO dnf -y remove $@" elif [ "$(command -v dnf)" ]; then CMD="$FAKE_SUDO dnf -y remove $@"
else CMD="echo '[ERROR] Incompatable System...'"; fi else CMD="echo '[ERROR] Incompatable System...'"; fi
INDEX=1 INDEX=1
echo ""
echo "[FAKE//OS] Remove: $@" echo "[FAKE//OS] Remove: $@"
echo "" echo ""
if ! eval "$CMD 2>> $FAKE_LOG"; then if ! eval "$CMD 2>> $FAKE_LOG"; then
@ -105,6 +107,7 @@ _fake_remove () {
INDEX=$(( INDEX + 1 )) INDEX=$(( INDEX + 1 ))
echo "" echo ""
echo "[ERROR] Retrying: Attempt $INDEX..." echo "[ERROR] Retrying: Attempt $INDEX..."
sleep 1
done done
fi fi
echo "[REMOVE] ----> Completed in $INDEX attempt(s)" >> $FAKE_LOG echo "[REMOVE] ----> Completed in $INDEX attempt(s)" >> $FAKE_LOG
@ -122,7 +125,9 @@ _fake_search () {
elif [ "$(command -v apk)" ]; then CMD="apk search $@" elif [ "$(command -v apk)" ]; then CMD="apk search $@"
elif [ "$(command -v dnf)" ]; then CMD="dnf search $@" elif [ "$(command -v dnf)" ]; then CMD="dnf search $@"
else CMD="echo '[ERROR] Incompatable System...'"; fi else CMD="echo '[ERROR] Incompatable System...'"; fi
echo ""
echo "[FAKE//OS] Search: $@" echo "[FAKE//OS] Search: $@"
echo ""
if ! eval "$CMD 2>> $FAKE_LOG"; then if ! eval "$CMD 2>> $FAKE_LOG"; then
echo "[FAKE//OS] Error: Search failed..." echo "[FAKE//OS] Error: Search failed..."
fi fi