diff --git a/fake-os.sh b/fake-os.sh index 6113d52..a938ea0 100644 --- a/fake-os.sh +++ b/fake-os.sh @@ -69,6 +69,7 @@ if [ "$FAKE_DEP" != "" ]; then while ! eval "$CMD"; do INDEX=$(( INDEX + 1 )) echo "[ERROR] Retrying: Attempt $INDEX..." + sleep 1 done fi fi diff --git a/src/fake_manager.sh b/src/fake_manager.sh index 94253c8..eb631f5 100644 --- a/src/fake_manager.sh +++ b/src/fake_manager.sh @@ -37,7 +37,6 @@ VARS=$(echo "$@" | sed -e 's/[^ ]* *//') # └───────────────────────────────────────┘ _fake_update () { echo "[UPDATE] $(date)" >> $FAKE_LOG - echo "" 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 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" else CMD="echo '[ERROR] Incompatable System...'"; fi INDEX=1 + echo "" echo "[FAKE//OS] Update: $CMD" echo "" if ! eval "$CMD 2>> $FAKE_LOG"; then @@ -52,6 +52,7 @@ _fake_update () { INDEX=$(( INDEX + 1 )) echo "" echo "[ERROR] Retrying: Attempt $INDEX..." + sleep 1 done fi echo "[UPDATE] ----> Completed in $INDEX attempt(s)" >> $FAKE_LOG @@ -64,7 +65,6 @@ _fake_update () { # └───────────────────────────────────────┘ _fake_install () { echo "[INSTALL] $@" >> $FAKE_LOG - echo "" 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 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 $@" else CMD="echo '[ERROR] Incompatable System...'"; fi INDEX=1 + echo "" echo "[FAKE//OS] Install: $@" echo "" if ! eval "$CMD 2>> $FAKE_LOG"; then @@ -79,6 +80,7 @@ _fake_install () { INDEX=$(( INDEX + 1 )) echo "" echo "[ERROR] Retrying: Attempt $INDEX..." + sleep 1 done fi echo "[INSTALL] ----> Completed in $INDEX attempt(s)" >> $FAKE_LOG @@ -90,7 +92,6 @@ _fake_install () { # └───────────────────────────────────────┘ _fake_remove () { echo "[REMOVE] $@" >> $FAKE_LOG - echo "" 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 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 $@" else CMD="echo '[ERROR] Incompatable System...'"; fi INDEX=1 + echo "" echo "[FAKE//OS] Remove: $@" echo "" if ! eval "$CMD 2>> $FAKE_LOG"; then @@ -105,6 +107,7 @@ _fake_remove () { INDEX=$(( INDEX + 1 )) echo "" echo "[ERROR] Retrying: Attempt $INDEX..." + sleep 1 done fi 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 dnf)" ]; then CMD="dnf search $@" else CMD="echo '[ERROR] Incompatable System...'"; fi + echo "" echo "[FAKE//OS] Search: $@" + echo "" if ! eval "$CMD 2>> $FAKE_LOG"; then echo "[FAKE//OS] Error: Search failed..." fi