diff --git a/setup-base-asahi.sh b/setup-base-asahi.sh index f69bc04..38623b1 100644 --- a/setup-base-asahi.sh +++ b/setup-base-asahi.sh @@ -85,23 +85,13 @@ dnf install -y \ ok "Pakete installiert" -# asciiquarium (Perl-basiert, nicht in Fedora-Repos) -echo "" -perl -MTerm::Animation -e1 2>/dev/null || cpan -T Term::Animation +# asciiquarium-ng (Python-Port, von git.motocamp.de) if ! command -v asciiquarium &>/dev/null; then - curl -fsSL https://robobunny.com/projects/asciiquarium/asciiquarium_1.1.tar.gz -o /tmp/asciiquarium.tar.gz \ - && tar xzf /tmp/asciiquarium.tar.gz -C /tmp \ - && cp /tmp/asciiquarium_1.1/asciiquarium /usr/local/bin/ \ + curl -fsSL "https://git.motocamp.de/rene/asciiquarium/raw/branch/main/asciiquarium_ng.py" \ + -o /usr/local/bin/asciiquarium \ && chmod +x /usr/local/bin/asciiquarium \ - && ok "asciiquarium installiert" \ - || warn "asciiquarium uebersprungen" - # Patch: beliebige Taste beendet asciiquarium (statt nur 'q') - if [ -f /usr/local/bin/asciiquarium ]; then - sed -i '/\$in eq .q.*quit/d' /usr/local/bin/asciiquarium - sed -i "s/elsif( \$in eq 'r'/if ( \$in eq 'r'/" /usr/local/bin/asciiquarium - sed -i "/\$in eq 'p'.*paused/a\\\t\t\telsif( \$in ne ERR ) { quit(); } # Any key exits" /usr/local/bin/asciiquarium - fi - rm -rf /tmp/asciiquarium* + && ok "asciiquarium-ng installiert" \ + || warn "asciiquarium-ng uebersprungen" fi # ── 6. WireGuard VPN ────────────────────────────────────────────────────── diff --git a/setup-base.sh b/setup-base.sh index ff4b981..3f40337 100755 --- a/setup-base.sh +++ b/setup-base.sh @@ -153,25 +153,17 @@ apt install -y \ || { fail "apt install fehlgeschlagen"; dpkg --configure -a; apt install -f -y; } ok "Pakete installiert (apt)" -# asciiquarium (nicht in apt verfuegbar, manuell installieren) -# benoetigt Term::Animation (ebenfalls nicht in apt, daher via CPAN) -apt-get install -y libcurses-perl -qq -perl -MTerm::Animation -e1 2>/dev/null || cpan -T Term::Animation +# asciiquarium-ng (Python-Port, von git.motocamp.de) if ! command -v asciiquarium &>/dev/null; then - curl -fsSL https://robobunny.com/projects/asciiquarium/asciiquarium_1.1.tar.gz -o /tmp/asciiquarium.tar.gz \ - && tar xzf /tmp/asciiquarium.tar.gz -C /tmp \ - && cp /tmp/asciiquarium_1.1/asciiquarium /usr/local/bin/ \ - && chmod +x /usr/local/bin/asciiquarium \ - && ok "asciiquarium installiert" \ - || warn "asciiquarium uebersprungen" - # Patch: beliebige Taste beendet asciiquarium (statt nur 'q') - # r=Redraw und p=Pause bleiben erhalten - if [ -f /usr/local/bin/asciiquarium ]; then - sed -i '/\$in eq .q.*quit/d' /usr/local/bin/asciiquarium - sed -i "s/elsif( \$in eq 'r'/if ( \$in eq 'r'/" /usr/local/bin/asciiquarium - sed -i "/\$in eq 'p'.*paused/a\\\t\t\telsif( \$in ne ERR ) { quit(); } # Any key exits" /usr/local/bin/asciiquarium + if command -v python3 &>/dev/null; then + curl -fsSL "https://git.motocamp.de/rene/asciiquarium/raw/branch/main/asciiquarium_ng.py" \ + -o /usr/local/bin/asciiquarium \ + && chmod +x /usr/local/bin/asciiquarium \ + && ok "asciiquarium-ng installiert" \ + || warn "asciiquarium-ng uebersprungen" + else + warn "asciiquarium: python3 nicht gefunden, uebersprungen" fi - rm -rf /tmp/asciiquarium* fi # fastfetch (nicht in apt verfuegbar, .deb von GitHub)