i18n: migrate all German text to English
Enforce the repo convention that committed text is English. Translates ABOUTME headers, code comments, log/error messages, shell prompts, and documentation across all files. CLAUDE.md files remain in German per policy.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
# ABOUTME: Installiert Themes die nicht via Pakete verfügbar sind (Cursor-Theme).
|
||||
# ABOUTME: Wird von post-install.sh aufgerufen.
|
||||
# ABOUTME: Installs themes not available via packages (cursor theme).
|
||||
# ABOUTME: Called by post-install.sh.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
@@ -14,18 +14,18 @@ log() {
|
||||
CURSOR_DEST="/usr/share/icons/Sweet-cursors"
|
||||
|
||||
if [[ -d "$CURSOR_DEST" ]]; then
|
||||
log "Sweet-cursors bereits installiert."
|
||||
log "Sweet-cursors already installed."
|
||||
else
|
||||
log "Installiere Sweet-cursors..."
|
||||
log "Installing Sweet-cursors..."
|
||||
TMPDIR=$(mktemp -d)
|
||||
git clone --depth 1 https://github.com/EliverLara/Sweet.git "$TMPDIR/sweet"
|
||||
|
||||
if [[ -d "$TMPDIR/sweet/kde/cursors/Sweet-cursors" ]]; then
|
||||
sudo cp -r "$TMPDIR/sweet/kde/cursors/Sweet-cursors" "$CURSOR_DEST"
|
||||
log "Sweet-cursors nach $CURSOR_DEST installiert."
|
||||
log "Sweet-cursors installed to $CURSOR_DEST."
|
||||
else
|
||||
echo "Cursor-Verzeichnis nicht gefunden im Repository." >&2
|
||||
echo "Bitte manuell installieren: https://github.com/EliverLara/Sweet" >&2
|
||||
echo "Cursor directory not found in repository." >&2
|
||||
echo "Please install manually: https://github.com/EliverLara/Sweet" >&2
|
||||
fi
|
||||
|
||||
rm -rf "$TMPDIR"
|
||||
|
||||
+67
-67
@@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
# ABOUTME: Post-Install-Script für Moonarch — installiert Pakete, Defaults und konfiguriert das System.
|
||||
# ABOUTME: Wird nach der archinstall-Basisinstallation als normaler User ausgeführt.
|
||||
# ABOUTME: Post-install script for Moonarch — installs packages, defaults and configures the system.
|
||||
# ABOUTME: Run as regular user after the archinstall base installation.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
@@ -10,69 +10,69 @@ OFFICIAL_PACKAGES="$PROJECT_DIR/packages/official.txt"
|
||||
AUR_PACKAGES="$PROJECT_DIR/packages/aur.txt"
|
||||
DEFAULTS_DIR="$PROJECT_DIR/defaults"
|
||||
|
||||
# --- Hilfsfunktionen ---
|
||||
# --- Helper functions ---
|
||||
|
||||
log() {
|
||||
echo -e "\e[1;34m[Moonarch]\e[0m $*"
|
||||
}
|
||||
|
||||
err() {
|
||||
echo -e "\e[1;31m[Moonarch FEHLER]\e[0m $*" >&2
|
||||
echo -e "\e[1;31m[Moonarch ERROR]\e[0m $*" >&2
|
||||
}
|
||||
|
||||
read_packages() {
|
||||
grep -v '^\s*#' "$1" | grep -v '^\s*$'
|
||||
}
|
||||
|
||||
# --- Voraussetzungen prüfen ---
|
||||
# --- Prerequisites ---
|
||||
|
||||
if [[ $EUID -eq 0 ]]; then
|
||||
err "Bitte NICHT als root ausführen. Das Script nutzt sudo wo nötig."
|
||||
err "Do NOT run as root. The script uses sudo where needed."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if ! command -v pacman &>/dev/null; then
|
||||
err "pacman nicht gefunden — ist das wirklich Arch Linux?"
|
||||
err "pacman not found — is this really Arch Linux?"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# --- Offizielle Pakete installieren ---
|
||||
# --- Install official packages ---
|
||||
|
||||
log "Installiere offizielle Pakete..."
|
||||
log "Installing official packages..."
|
||||
if [[ -f "$OFFICIAL_PACKAGES" ]]; then
|
||||
# shellcheck disable=SC2046
|
||||
sudo pacman -S --needed --noconfirm $(read_packages "$OFFICIAL_PACKAGES")
|
||||
else
|
||||
err "Paketliste nicht gefunden: $OFFICIAL_PACKAGES"
|
||||
err "Package list not found: $OFFICIAL_PACKAGES"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# --- paru installieren (AUR Helper) ---
|
||||
# --- Install paru (AUR Helper) ---
|
||||
|
||||
if ! command -v paru &>/dev/null; then
|
||||
log "Installiere paru..."
|
||||
log "Installing paru..."
|
||||
PARU_TMPDIR=$(mktemp -d)
|
||||
git clone https://aur.archlinux.org/paru.git "$PARU_TMPDIR/paru"
|
||||
(cd "$PARU_TMPDIR/paru" && makepkg -si --noconfirm)
|
||||
rm -rf "$PARU_TMPDIR"
|
||||
else
|
||||
log "paru bereits installiert."
|
||||
log "paru already installed."
|
||||
fi
|
||||
|
||||
# --- AUR-Pakete installieren ---
|
||||
# --- Install AUR packages ---
|
||||
|
||||
log "Installiere AUR-Pakete..."
|
||||
log "Installing AUR packages..."
|
||||
if [[ -f "$AUR_PACKAGES" ]]; then
|
||||
# shellcheck disable=SC2046
|
||||
paru -S --needed --noconfirm $(read_packages "$AUR_PACKAGES")
|
||||
else
|
||||
err "AUR-Paketliste nicht gefunden: $AUR_PACKAGES"
|
||||
err "AUR package list not found: $AUR_PACKAGES"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# --- Moonarch custom paru repo einrichten ---
|
||||
# --- Set up Moonarch custom paru repo ---
|
||||
|
||||
log "Richte Moonarch paru-Repo ein..."
|
||||
log "Setting up Moonarch paru repo..."
|
||||
PARU_CONF="$HOME/.config/paru/paru.conf"
|
||||
mkdir -p "$(dirname "$PARU_CONF")"
|
||||
if ! grep -q '\[moonarch\]' "$PARU_CONF" 2>/dev/null; then
|
||||
@@ -80,102 +80,102 @@ if ! grep -q '\[moonarch\]' "$PARU_CONF" 2>/dev/null; then
|
||||
[moonarch]
|
||||
Url = https://gitea.moonarch.de/nevaforget/moonarch-pkgbuilds.git
|
||||
EOCONF
|
||||
log " + Moonarch-Repo zu paru.conf hinzugefuegt."
|
||||
log " + Moonarch repo added to paru.conf."
|
||||
else
|
||||
log " ~ Moonarch-Repo bereits in paru.conf."
|
||||
log " ~ Moonarch repo already in paru.conf."
|
||||
fi
|
||||
|
||||
paru -Sy --pkgbuilds --noconfirm
|
||||
paru -S --needed --noconfirm moonset-git moonlock-git moongreet-git
|
||||
|
||||
# --- Themes installieren (Cursor etc.) ---
|
||||
# --- Install themes (cursor etc.) ---
|
||||
|
||||
log "Installiere Themes..."
|
||||
log "Installing themes..."
|
||||
"$SCRIPT_DIR/install-themes.sh"
|
||||
|
||||
# --- XDG Defaults installieren ---
|
||||
# --- Install XDG defaults ---
|
||||
|
||||
log "Installiere XDG-Defaults nach /etc/xdg/..."
|
||||
log "Installing XDG defaults to /etc/xdg/..."
|
||||
sudo cp -r "$DEFAULTS_DIR/xdg/"* /etc/xdg/
|
||||
|
||||
# Sicherstellen dass Rofi-Scripts ausführbar sind
|
||||
# Ensure Rofi scripts are executable
|
||||
sudo find /etc/xdg/rofi -name "*.sh" -exec chmod +x {} \;
|
||||
|
||||
# --- GTK4 Theme-Symlinks für libadwaita-Apps ---
|
||||
# --- GTK4 theme symlinks for libadwaita apps ---
|
||||
|
||||
THEME_NAME="Colloid-Catppuccin"
|
||||
THEME_GTK4="/usr/share/themes/$THEME_NAME/gtk-4.0"
|
||||
GTK4_XDG="/etc/xdg/gtk-4.0"
|
||||
|
||||
if [[ -d "$THEME_GTK4" ]]; then
|
||||
log "Erstelle systemweite GTK4-Symlinks für $THEME_NAME..."
|
||||
log "Creating system-wide GTK4 symlinks for $THEME_NAME..."
|
||||
|
||||
# gtk.css zeigt auf gtk-dark.css, damit libadwaita-Apps das Dark-Theme laden
|
||||
# gtk.css points to gtk-dark.css so libadwaita apps load the dark theme
|
||||
sudo ln -sf "$THEME_GTK4/gtk-dark.css" "$GTK4_XDG/gtk.css"
|
||||
sudo ln -sf "$THEME_GTK4/gtk-dark.css" "$GTK4_XDG/gtk-dark.css"
|
||||
|
||||
# Assets-Symlink: erst entfernen falls vorhanden (ln -sf auf Verzeichnisse folgt dem Link)
|
||||
# Assets symlink: remove first if exists (ln -sf on directories follows the link)
|
||||
sudo rm -f "$GTK4_XDG/assets"
|
||||
sudo ln -s "$THEME_GTK4/assets" "$GTK4_XDG/assets"
|
||||
else
|
||||
err "GTK4-Theme nicht gefunden: $THEME_GTK4 — libadwaita-Apps nutzen Fallback-Theme."
|
||||
err "GTK4 theme not found: $THEME_GTK4 — libadwaita apps will use fallback theme."
|
||||
fi
|
||||
|
||||
# --- gsettings für GTK-Theme und Dark-Mode ---
|
||||
# --- gsettings for GTK theme and dark mode ---
|
||||
|
||||
log "Setze gsettings für GTK-Theme..."
|
||||
log "Setting gsettings for GTK theme..."
|
||||
gsettings set org.gnome.desktop.interface gtk-theme "$THEME_NAME"
|
||||
gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
|
||||
gsettings set org.gnome.desktop.interface icon-theme 'Colloid-Grey-Catppuccin-Dark'
|
||||
gsettings set org.gnome.desktop.interface font-name 'UbuntuSans Nerd Font 11'
|
||||
|
||||
# --- Helper-Scripts installieren ---
|
||||
# --- Install helper scripts ---
|
||||
|
||||
log "Installiere Moonarch Helper-Scripts nach /usr/local/bin/..."
|
||||
log "Installing Moonarch helper scripts to /usr/local/bin/..."
|
||||
sudo install -m 755 "$DEFAULTS_DIR/bin/moonarch-"* /usr/local/bin/
|
||||
|
||||
# --- Zsh-Konfiguration ---
|
||||
# --- Zsh configuration ---
|
||||
|
||||
log "Installiere Zsh-Default-Config..."
|
||||
log "Installing Zsh default config..."
|
||||
sudo cp "$DEFAULTS_DIR/shell/zshrc" /etc/zsh/zshrc.moonarch
|
||||
|
||||
# Eintrag in /etc/zsh/zshrc damit Moonarch-Defaults geladen werden,
|
||||
# sofern der User keine eigene ~/.zshrc hat
|
||||
# Entry in /etc/zsh/zshrc to load Moonarch defaults
|
||||
# unless the user has their own ~/.zshrc
|
||||
if ! grep -q "zshrc.moonarch" /etc/zsh/zshrc 2>/dev/null; then
|
||||
echo '# Moonarch defaults (wird durch ~/.zshrc überschrieben)' | sudo tee -a /etc/zsh/zshrc > /dev/null
|
||||
echo '# Moonarch defaults (overridden by ~/.zshrc)' | sudo tee -a /etc/zsh/zshrc > /dev/null
|
||||
echo '[[ ! -f "$HOME/.zshrc" ]] && source /etc/zsh/zshrc.moonarch' | sudo tee -a /etc/zsh/zshrc > /dev/null
|
||||
fi
|
||||
|
||||
# Falls der User noch keine .zshrc hat, Moonarch-Default verlinken
|
||||
# If user has no .zshrc yet, link Moonarch defaults
|
||||
if [[ ! -f "$HOME/.zshrc" ]]; then
|
||||
log "Keine ~/.zshrc gefunden — sourcing Moonarch-Defaults."
|
||||
log "No ~/.zshrc found — sourcing Moonarch defaults."
|
||||
mkdir -p "$HOME/.zshrc.d"
|
||||
echo "# Moonarch-Defaults laden, eigene Overrides in ~/.zshrc.d/ oder hier unten" > "$HOME/.zshrc"
|
||||
echo "# Load Moonarch defaults, add custom overrides in ~/.zshrc.d/ or below" > "$HOME/.zshrc"
|
||||
echo "source /etc/zsh/zshrc.moonarch" >> "$HOME/.zshrc"
|
||||
fi
|
||||
|
||||
# --- moonlock systemd user service ---
|
||||
|
||||
log "Konfiguriere moonlock User-Service..."
|
||||
log "Configuring moonlock user service..."
|
||||
sudo mkdir -p /etc/systemd/user
|
||||
sudo cp "$DEFAULTS_DIR/etc/systemd/user/moonlock.service" /etc/systemd/user/moonlock.service
|
||||
|
||||
# --- greetd / moongreet Konfiguration ---
|
||||
# --- greetd / moongreet configuration ---
|
||||
|
||||
log "Konfiguriere greetd + moongreet..."
|
||||
log "Configuring greetd + moongreet..."
|
||||
sudo mkdir -p /etc/greetd
|
||||
sudo cp "$DEFAULTS_DIR/etc/greetd/config.toml" /etc/greetd/config.toml
|
||||
sudo mkdir -p /etc/moongreet
|
||||
sudo cp "$DEFAULTS_DIR/etc/moongreet/moongreet.toml" /etc/moongreet/moongreet.toml
|
||||
|
||||
# Default-Wallpaper installieren (Greeter, Lockscreen, Desktop)
|
||||
log "Installiere Default-Wallpaper..."
|
||||
# Install default wallpaper (greeter, lockscreen, desktop)
|
||||
log "Installing default wallpaper..."
|
||||
sudo mkdir -p /usr/share/moonarch
|
||||
sudo cp "$DEFAULTS_DIR/backgrounds/wallpaper.jpg" /usr/share/moonarch/wallpaper.jpg
|
||||
|
||||
# --- Systemd-Services aktivieren ---
|
||||
# --- Enable systemd services ---
|
||||
|
||||
log "Aktiviere Services..."
|
||||
log "Enabling services..."
|
||||
SERVICES=(
|
||||
"NetworkManager"
|
||||
"bluetooth"
|
||||
@@ -191,20 +191,20 @@ for service in "${SERVICES[@]}"; do
|
||||
sudo systemctl enable "$service"
|
||||
log " + $service"
|
||||
else
|
||||
log " ~ $service nicht gefunden, uebersprungen."
|
||||
log " ~ $service not found, skipped."
|
||||
fi
|
||||
done
|
||||
|
||||
# --- Shell auf zsh setzen ---
|
||||
# --- Set shell to zsh ---
|
||||
|
||||
if [[ "$SHELL" != */zsh ]]; then
|
||||
log "Setze Standard-Shell auf zsh..."
|
||||
log "Setting default shell to zsh..."
|
||||
chsh -s "$(which zsh)"
|
||||
fi
|
||||
|
||||
# --- Firewall aktivieren ---
|
||||
# --- Enable firewall ---
|
||||
|
||||
log "Konfiguriere UFW..."
|
||||
log "Configuring UFW..."
|
||||
sudo ufw default deny incoming
|
||||
sudo ufw default allow outgoing
|
||||
sudo ufw --force enable
|
||||
@@ -212,17 +212,17 @@ sudo ufw --force enable
|
||||
# --- Docker-Gruppe ---
|
||||
|
||||
if ! groups | grep -q docker; then
|
||||
log "Fuege User zur docker-Gruppe hinzu..."
|
||||
log "Adding user to docker group..."
|
||||
sudo usermod -aG docker "$USER"
|
||||
fi
|
||||
|
||||
# --- User-Config-Defaults installieren ---
|
||||
# --- Install user config defaults ---
|
||||
|
||||
log "Installiere User-Config-Defaults nach ~/.config/..."
|
||||
log "Installing user config defaults to ~/.config/..."
|
||||
USER_DEFAULTS_DIR="$DEFAULTS_DIR/user"
|
||||
if [[ -d "$USER_DEFAULTS_DIR" ]]; then
|
||||
# Jedes Unterverzeichnis in defaults/user/ entspricht einem ~/.config/-Verzeichnis.
|
||||
# Dateien werden nur kopiert wenn sie noch nicht existieren (kein Ueberschreiben).
|
||||
# Each subdirectory in defaults/user/ corresponds to a ~/.config/ directory.
|
||||
# Files are only copied if they don't exist yet (no overwriting).
|
||||
for src_dir in "$USER_DEFAULTS_DIR"/*/; do
|
||||
app_name="$(basename "$src_dir")"
|
||||
dest_dir="$HOME/.config/$app_name"
|
||||
@@ -235,32 +235,32 @@ if [[ -d "$USER_DEFAULTS_DIR" ]]; then
|
||||
cp "$src_file" "$dest_file"
|
||||
log " + $app_name/$rel_path"
|
||||
else
|
||||
log " ~ $app_name/$rel_path existiert bereits, uebersprungen."
|
||||
log " ~ $app_name/$rel_path already exists, skipped."
|
||||
fi
|
||||
done
|
||||
done
|
||||
fi
|
||||
|
||||
# --- Screenshots-Verzeichnis ---
|
||||
# --- Screenshots directory ---
|
||||
|
||||
mkdir -p "$HOME/Pictures/Screenshots"
|
||||
mkdir -p "$HOME/Pictures/Wallpaper"
|
||||
|
||||
# --- moonarch-update Symlink ---
|
||||
|
||||
log "Erstelle moonarch-update Kommando..."
|
||||
log "Creating moonarch-update command..."
|
||||
sudo ln -sf "$PROJECT_DIR/scripts/update.sh" /usr/local/bin/moonarch-update
|
||||
|
||||
# --- Fertig ---
|
||||
# --- Done ---
|
||||
|
||||
log ""
|
||||
log "============================================"
|
||||
log " Moonarch Installation abgeschlossen!"
|
||||
log " Moonarch installation complete!"
|
||||
log "============================================"
|
||||
log ""
|
||||
log "Naechste Schritte:"
|
||||
log "Next steps:"
|
||||
log " 1. Reboot"
|
||||
log " 2. Wallpaper in ~/Pictures/Wallpaper/ ablegen"
|
||||
log " 2. Place wallpapers in ~/Pictures/Wallpaper/"
|
||||
log " 3. rustup default stable"
|
||||
log " 4. User-Overrides in ~/.config/ oder ~/.zshrc.d/"
|
||||
log " 4. User overrides in ~/.config/ or ~/.zshrc.d/"
|
||||
log ""
|
||||
|
||||
+51
-51
@@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
# ABOUTME: Moonarch System-Updater — aktualisiert System, Repo und Defaults.
|
||||
# ABOUTME: Sollte regelmäßig ausgeführt werden um das System synchron zu halten.
|
||||
# ABOUTME: Moonarch system updater — updates system, repo and defaults.
|
||||
# ABOUTME: Should be run regularly to keep the system in sync.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
@@ -10,14 +10,14 @@ OFFICIAL_PACKAGES="$PROJECT_DIR/packages/official.txt"
|
||||
AUR_PACKAGES="$PROJECT_DIR/packages/aur.txt"
|
||||
DEFAULTS_DIR="$PROJECT_DIR/defaults"
|
||||
|
||||
# --- Hilfsfunktionen ---
|
||||
# --- Helper functions ---
|
||||
|
||||
log() {
|
||||
echo -e "\e[1;34m[Moonarch]\e[0m $*"
|
||||
}
|
||||
|
||||
err() {
|
||||
echo -e "\e[1;31m[Moonarch FEHLER]\e[0m $*" >&2
|
||||
echo -e "\e[1;31m[Moonarch ERROR]\e[0m $*" >&2
|
||||
}
|
||||
|
||||
read_packages() {
|
||||
@@ -25,20 +25,20 @@ read_packages() {
|
||||
}
|
||||
|
||||
confirm() {
|
||||
read -r -p "$1 [j/N] " response
|
||||
[[ "$response" =~ ^[jJyY]$ ]]
|
||||
read -r -p "$1 [y/N] " response
|
||||
[[ "$response" =~ ^[yY]$ ]]
|
||||
}
|
||||
|
||||
# --- Voraussetzungen ---
|
||||
# --- Prerequisites ---
|
||||
|
||||
if [[ $EUID -eq 0 ]]; then
|
||||
err "Bitte NICHT als root ausfuehren."
|
||||
err "Do NOT run as root."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# --- 1. Moonarch-Repo aktualisieren ---
|
||||
# --- 1. Update Moonarch repo ---
|
||||
|
||||
log "=== Moonarch Repo aktualisieren ==="
|
||||
log "=== Update Moonarch repo ==="
|
||||
|
||||
cd "$PROJECT_DIR"
|
||||
if git rev-parse --is-inside-work-tree &>/dev/null; then
|
||||
@@ -47,75 +47,75 @@ if git rev-parse --is-inside-work-tree &>/dev/null; then
|
||||
REMOTE=$(git rev-parse @{u} 2>/dev/null || echo "$LOCAL")
|
||||
|
||||
if [[ "$LOCAL" != "$REMOTE" ]]; then
|
||||
log "Updates verfuegbar."
|
||||
log "Updates available."
|
||||
git --no-pager log --oneline "$LOCAL".."$REMOTE"
|
||||
echo ""
|
||||
if confirm "Repo aktualisieren?"; then
|
||||
if confirm "Update repo?"; then
|
||||
git pull --ff-only
|
||||
log "Repo aktualisiert."
|
||||
log "Repo updated."
|
||||
else
|
||||
log "Repo-Update uebersprungen."
|
||||
log "Repo update skipped."
|
||||
fi
|
||||
else
|
||||
log "Repo ist aktuell."
|
||||
log "Repo is up to date."
|
||||
fi
|
||||
else
|
||||
log "Kein Git-Repo — Repo-Update uebersprungen."
|
||||
log "Not a git repo — repo update skipped."
|
||||
fi
|
||||
|
||||
# --- 2. System-Pakete aktualisieren ---
|
||||
# --- 2. Update system packages ---
|
||||
|
||||
log "=== System-Pakete aktualisieren ==="
|
||||
log "=== Update system packages ==="
|
||||
|
||||
if confirm "pacman -Syu ausfuehren?"; then
|
||||
if confirm "Run pacman -Syu?"; then
|
||||
sudo pacman -Syu
|
||||
else
|
||||
log "System-Update uebersprungen."
|
||||
log "System update skipped."
|
||||
fi
|
||||
|
||||
if command -v paru &>/dev/null; then
|
||||
if confirm "AUR-Pakete aktualisieren (paru -Sua)?"; then
|
||||
if confirm "Update AUR packages (paru -Sua)?"; then
|
||||
paru -Sua
|
||||
else
|
||||
log "AUR-Update uebersprungen."
|
||||
log "AUR update skipped."
|
||||
fi
|
||||
fi
|
||||
|
||||
# --- 3. Fehlende Pakete nachinstallieren ---
|
||||
# --- 3. Install missing packages ---
|
||||
|
||||
log "=== Paketlisten abgleichen ==="
|
||||
log "=== Reconcile package lists ==="
|
||||
|
||||
if [[ -f "$OFFICIAL_PACKAGES" ]]; then
|
||||
MISSING_OFFICIAL=$(comm -23 <(read_packages "$OFFICIAL_PACKAGES" | sort) <(pacman -Qqe | sort) || true)
|
||||
if [[ -n "$MISSING_OFFICIAL" ]]; then
|
||||
log "Fehlende offizielle Pakete:"
|
||||
log "Missing official packages:"
|
||||
echo "$MISSING_OFFICIAL"
|
||||
if confirm "Installieren?"; then
|
||||
if confirm "Install?"; then
|
||||
# shellcheck disable=SC2086
|
||||
sudo pacman -S --needed --noconfirm $MISSING_OFFICIAL
|
||||
fi
|
||||
else
|
||||
log "Alle offiziellen Pakete installiert."
|
||||
log "All official packages installed."
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ -f "$AUR_PACKAGES" ]] && command -v paru &>/dev/null; then
|
||||
MISSING_AUR=$(comm -23 <(read_packages "$AUR_PACKAGES" | sort) <(pacman -Qqe | sort) || true)
|
||||
if [[ -n "$MISSING_AUR" ]]; then
|
||||
log "Fehlende AUR-Pakete:"
|
||||
log "Missing AUR packages:"
|
||||
echo "$MISSING_AUR"
|
||||
if confirm "Installieren?"; then
|
||||
if confirm "Install?"; then
|
||||
# shellcheck disable=SC2086
|
||||
paru -S --needed --noconfirm $MISSING_AUR
|
||||
fi
|
||||
else
|
||||
log "Alle AUR-Pakete installiert."
|
||||
log "All AUR packages installed."
|
||||
fi
|
||||
fi
|
||||
|
||||
# --- 4. Defaults aktualisieren ---
|
||||
# --- 4. Update defaults ---
|
||||
|
||||
log "=== Defaults aktualisieren ==="
|
||||
log "=== Update defaults ==="
|
||||
|
||||
# XDG Defaults
|
||||
CHANGED_XDG=false
|
||||
@@ -124,15 +124,15 @@ if ! diff -rq "$DEFAULTS_DIR/xdg/" /etc/xdg/ --exclude='*.pyc' &>/dev/null 2>&1;
|
||||
fi
|
||||
|
||||
if $CHANGED_XDG; then
|
||||
log "XDG-Defaults haben sich geaendert."
|
||||
log "XDG defaults have changed."
|
||||
diff -rq "$DEFAULTS_DIR/xdg/" /etc/xdg/ --exclude='*.pyc' 2>/dev/null | head -20 || true
|
||||
echo ""
|
||||
if confirm "XDG-Defaults nach /etc/xdg/ deployen?"; then
|
||||
if confirm "Deploy XDG defaults to /etc/xdg/?"; then
|
||||
sudo cp -r "$DEFAULTS_DIR/xdg/"* /etc/xdg/
|
||||
log "XDG-Defaults aktualisiert."
|
||||
log "XDG defaults updated."
|
||||
fi
|
||||
else
|
||||
log "XDG-Defaults sind aktuell."
|
||||
log "XDG defaults are up to date."
|
||||
fi
|
||||
|
||||
# Binaries
|
||||
@@ -146,51 +146,51 @@ for bin in "$DEFAULTS_DIR/bin/moonarch-"*; do
|
||||
done
|
||||
|
||||
if $CHANGED_BIN; then
|
||||
log "Moonarch-Binaries haben sich geaendert."
|
||||
log "Moonarch binaries have changed."
|
||||
for bin in "$DEFAULTS_DIR/bin/moonarch-"*; do
|
||||
name=$(basename "$bin")
|
||||
if ! cmp -s "$bin" "/usr/local/bin/$name" 2>/dev/null; then
|
||||
log " ~ $name"
|
||||
fi
|
||||
done
|
||||
if confirm "Binaries nach /usr/local/bin/ deployen?"; then
|
||||
if confirm "Deploy binaries to /usr/local/bin/?"; then
|
||||
sudo install -m 755 "$DEFAULTS_DIR/bin/moonarch-"* /usr/local/bin/
|
||||
log "Binaries aktualisiert."
|
||||
log "Binaries updated."
|
||||
fi
|
||||
else
|
||||
log "Binaries sind aktuell."
|
||||
log "Binaries are up to date."
|
||||
fi
|
||||
|
||||
# Zsh
|
||||
if ! cmp -s "$DEFAULTS_DIR/shell/zshrc" /etc/zsh/zshrc.moonarch 2>/dev/null; then
|
||||
log "Zsh-Defaults haben sich geaendert."
|
||||
if confirm "Zsh-Defaults aktualisieren?"; then
|
||||
log "Zsh defaults have changed."
|
||||
if confirm "Update Zsh defaults?"; then
|
||||
sudo cp "$DEFAULTS_DIR/shell/zshrc" /etc/zsh/zshrc.moonarch
|
||||
log "Zsh-Defaults aktualisiert."
|
||||
log "Zsh defaults updated."
|
||||
fi
|
||||
else
|
||||
log "Zsh-Defaults sind aktuell."
|
||||
log "Zsh defaults are up to date."
|
||||
fi
|
||||
|
||||
# --- 5. Verwaiste Pakete ---
|
||||
# --- 5. Orphaned packages ---
|
||||
|
||||
log "=== Verwaiste Pakete ==="
|
||||
log "=== Orphaned packages ==="
|
||||
|
||||
ORPHANS=$(pacman -Qdtq 2>/dev/null || true)
|
||||
if [[ -n "$ORPHANS" ]]; then
|
||||
log "Verwaiste Pakete gefunden:"
|
||||
log "Orphaned packages found:"
|
||||
echo "$ORPHANS"
|
||||
if confirm "Entfernen?"; then
|
||||
if confirm "Remove?"; then
|
||||
# shellcheck disable=SC2086
|
||||
sudo pacman -Rsn --noconfirm $ORPHANS
|
||||
fi
|
||||
else
|
||||
log "Keine verwaisten Pakete."
|
||||
log "No orphaned packages."
|
||||
fi
|
||||
|
||||
# --- Fertig ---
|
||||
# --- Done ---
|
||||
|
||||
log ""
|
||||
log "============================================"
|
||||
log " Moonarch Update abgeschlossen!"
|
||||
log " Moonarch update complete!"
|
||||
log "============================================"
|
||||
|
||||
Reference in New Issue
Block a user