diff --git a/usr/bin/setup-assistant b/usr/bin/setup-assistant index 82073e8..802f453 100755 --- a/usr/bin/setup-assistant +++ b/usr/bin/setup-assistant @@ -261,11 +261,17 @@ function upgrade2ultimate fi - sh /tmp/setup-assistant/prepare.sh + if [ -e "/tmp/setup-assistant/prepare.sh" ]; then + sh /tmp/setup-assistant/prepare.sh + fi + cat /tmp/setup-assistant/pkgs.txt | sed '/^$/d;s/[[:blank:]]//g' > /tmp/setup-assistant/pkgs-install.txt - alacritty -e sudo pacman "--needed -S - < /tmp/setup-assistant/pkgs-install.txt" - sh /tmp/setup-assistant/setup.sh - read -p "Press enter finish the setup!" + alacritty -e sudo pacman "--needed -S - < /tmp/setup-assistant/pkgs-install.txt" + + if [ -e "/tmp/setup-assistant/setup.sh" ]; then + sh /tmp/setup-assistant/setup.sh + fi + rm -rf /tmp/setup-assistant }