v3-revamp

This commit is contained in:
2026-07-06 16:29:38 +02:00
parent c2770f49ed
commit 9eff92a1bb
4 changed files with 34 additions and 38 deletions
+5 -5
View File
@@ -63,7 +63,7 @@ pause_if_debug() {
#------------------------------------------ #------------------------------------------
echo echo
color_yellow "----------------------------------------------------------------" color_yellow "----------------------------------------------------------------"
color_yellow " script version 3.0" color_yellow "Script version 3.0"
color_yellow "----------------------------------------------------------------" color_yellow "----------------------------------------------------------------"
echo echo
@@ -72,7 +72,7 @@ echo
#------------------------------------------ #------------------------------------------
echo echo
color_yellow "----------------------------------------------------------------" color_yellow "----------------------------------------------------------------"
color_yellow " Start OS Detection" color_yellow "Start OS Detection"
color_yellow "----------------------------------------------------------------" color_yellow "----------------------------------------------------------------"
echo echo
@@ -123,7 +123,7 @@ pause_if_debug
#------------------------------------------ #------------------------------------------
echo echo
color_yellow "----------------------------------------------------------------" color_yellow "----------------------------------------------------------------"
color_yellow " Desktop Environment Selection" color_yellow "Desktop Environment Selection"
color_yellow "----------------------------------------------------------------" color_yellow "----------------------------------------------------------------"
echo echo
@@ -175,7 +175,7 @@ pause_if_debug
#------------------------------------------ #------------------------------------------
echo echo
color_yellow "----------------------------------------------------------------" color_yellow "----------------------------------------------------------------"
color_yellow " Tiling WM Selection\n" color_yellow "Tiling WM Selection\n"
color_yellow "----------------------------------------------------------------" color_yellow "----------------------------------------------------------------"
echo echo
@@ -211,7 +211,7 @@ pause_if_debug
#------------------------------------------ #------------------------------------------
echo echo
color_yellow "----------------------------------------------------------------" color_yellow "----------------------------------------------------------------"
color_yellow " Installation Level Selection\n" color_yellow "Installation Level Selection\n"
color_yellow "----------------------------------------------------------------" color_yellow "----------------------------------------------------------------"
echo echo
+5 -6
View File
@@ -17,12 +17,11 @@ if [ ! -t 1 ]; then
RED="" GREEN="" YELLOW="" CYAN="" GRAY="" BOLD="" RESET="" RED="" GREEN="" YELLOW="" CYAN="" GRAY="" BOLD="" RESET=""
fi fi
color_yellow() { printf '%b' "$YELLOW"; } color_yellow() { printf "%b%s%b\n" "$YELLOW" "$*" "$RESET"; }
color_cyan() { printf '%b' "$CYAN"; } color_cyan() { printf "%b%s%b\n" "$CYAN" "$*" "$RESET"; }
color_red() { printf '%b' "$RED"; } color_red() { printf "%b%s%b\n" "$RED" "$*" "$RESET"; }
color_green() { printf '%b' "$GREEN"; } color_green() { printf "%b%s%b\n" "$GREEN" "$*" "$RESET"; }
color_gray() { printf '%b' "$GRAY"; } color_gray() { printf "%b%s%b\n" "$GRAY" "$*" "$RESET"; }
color_reset() { printf '%b' "$RESET"; }
#------------------------------------------ #------------------------------------------
# Use exported variables from main detection script # Use exported variables from main detection script
+7 -8
View File
@@ -17,12 +17,11 @@ if [ ! -t 1 ]; then
RED="" GREEN="" YELLOW="" CYAN="" GRAY="" BOLD="" RESET="" RED="" GREEN="" YELLOW="" CYAN="" GRAY="" BOLD="" RESET=""
fi fi
color_yellow() { printf '%b' "$YELLOW"; } color_yellow() { printf "%b%s%b\n" "$YELLOW" "$*" "$RESET"; }
color_cyan() { printf '%b' "$CYAN"; } color_cyan() { printf "%b%s%b\n" "$CYAN" "$*" "$RESET"; }
color_red() { printf '%b' "$RED"; } color_red() { printf "%b%s%b\n" "$RED" "$*" "$RESET"; }
color_green() { printf '%b' "$GREEN"; } color_green() { printf "%b%s%b\n" "$GREEN" "$*" "$RESET"; }
color_gray() { printf '%b' "$GRAY"; } color_gray() { printf "%b%s%b\n" "$GRAY" "$*" "$RESET"; }
color_reset() { printf '%b' "$RESET"; }
#------------------------------------------ #------------------------------------------
# Use exported variables from main detection script # Use exported variables from main detection script
@@ -99,8 +98,8 @@ fi
#------------------------------------------ #------------------------------------------
# 4. Enable Services # 4. Enable Services
#------------------------------------------ #------------------------------------------
color_cyan; echo "Enabling services..."; color_reset color_cyan "Enabling services..."
sudo systemctl enable --now fstrim.timer sudo systemctl enable --now fstrim.timer
sudo systemctl enable --now chronyd || true sudo systemctl enable --now chronyd || true
color_green; echo "Fedora Minimal setup completed."; color_reset color_green "Fedora Minimal setup completed."
+17 -19
View File
@@ -17,13 +17,11 @@ if [ ! -t 1 ]; then
RED="" GREEN="" YELLOW="" CYAN="" GRAY="" BOLD="" RESET="" RED="" GREEN="" YELLOW="" CYAN="" GRAY="" BOLD="" RESET=""
fi fi
color_yellow() { printf '%b' "$YELLOW"; } color_yellow() { printf "%b%s%b\n" "$YELLOW" "$*" "$RESET"; }
color_cyan() { printf '%b' "$CYAN"; } color_cyan() { printf "%b%s%b\n" "$CYAN" "$*" "$RESET"; }
color_red() { printf '%b' "$RED"; } color_red() { printf "%b%s%b\n" "$RED" "$*" "$RESET"; }
color_green() { printf '%b' "$GREEN"; } color_green() { printf "%b%s%b\n" "$GREEN" "$*" "$RESET"; }
color_gray() { printf '%b' "$GRAY"; } color_gray() { printf "%b%s%b\n" "$GRAY" "$*" "$RESET"; }
color_reset() { printf '%b' "$RESET"; }
#------------------------------------------ #------------------------------------------
# Use exported variables from main detection script # Use exported variables from main detection script
@@ -120,22 +118,22 @@ sudo dnf update -y
color_yellow "Detected OS / Desktop Environment / Tiling Window Manager" color_yellow "Detected OS / Desktop Environment / Tiling Window Manager"
echo echo
color_gray "Installing OS-specific packages..." color_gray "Installing OS-specific packages..."
color_gray "Selected DE: $DE" color_gray "Selected DE:" "$DE"
color_gray "Selected TWM: $TWM" color_gray "Selected TWM:" "$TWM"
color_gray "Installation Level: $INSTALL_LEVEL" color_gray "Installation Level:" "$INSTALL_LEVEL"
#------------------------------------------ #------------------------------------------
# 4. Desktop Environment installation # 4. Desktop Environment installation
#------------------------------------------ #------------------------------------------
case "$DE" in case "$DE" in
xfce|plasma|gnome) xfce|plasma|gnome)
color_yellow "Preparing to install $DE..." color_yellow "Preparing to install" "$DE"
SCRIPT_NAME="$SCRIPT_DIR/${OS}-${DE}.sh" SCRIPT_NAME="$SCRIPT_DIR/${OS}-${DE}.sh"
if [[ -f "$SCRIPT_NAME" ]]; then if [[ -f "$SCRIPT_NAME" ]]; then
color_cyan "Running $SCRIPT_NAME..." color_cyan "Running" "$SCRIPT_NAME"
bash "$SCRIPT_NAME" bash "$SCRIPT_NAME"
else else
color_red "Error: $SCRIPT_NAME not found!" color_red "Error:" "$SCRIPT_NAME" "not found!"
exit 1 exit 1
fi fi
;; ;;
@@ -149,13 +147,13 @@ esac
#------------------------------------------ #------------------------------------------
case "$TWM" in case "$TWM" in
chadwm|hyprland|niri) chadwm|hyprland|niri)
color_yellow "Installing $TWM..." color_yellow "Installing" "$TWM"
SCRIPT_NAME="$SCRIPT_DIR/${OS}-${TWM}.sh" SCRIPT_NAME="$SCRIPT_DIR/${OS}-${TWM}.sh"
if [[ -f "$SCRIPT_NAME" ]]; then if [[ -f "$SCRIPT_NAME" ]]; then
color_cyan "Running $SCRIPT_NAME..." color_cyan "Running" "$SCRIPT_NAME"
bash "$SCRIPT_NAME" bash "$SCRIPT_NAME"
else else
color_red "Error: $SCRIPT_NAME not found!" color_red "Error:" "$SCRIPT_NAME" "not found!"
exit 1 exit 1
fi fi
;; ;;
@@ -169,13 +167,13 @@ esac
#------------------------------------------ #------------------------------------------
case "$INSTALL_LEVEL" in case "$INSTALL_LEVEL" in
minimal|full|workstation|server) minimal|full|workstation|server)
color_cyan "Installation level: $INSTALL_LEVEL" color_cyan "Installation level:" "$INSTALL_LEVEL"
SCRIPT_NAME="$SCRIPT_DIR/${OS}-${INSTALL_LEVEL}.sh" SCRIPT_NAME="$SCRIPT_DIR/${OS}-${INSTALL_LEVEL}.sh"
if [[ -f "$SCRIPT_NAME" ]]; then if [[ -f "$SCRIPT_NAME" ]]; then
color_cyan "Running $SCRIPT_NAME..." color_cyan "Running" "$SCRIPT_NAME"
bash "$SCRIPT_NAME" bash "$SCRIPT_NAME"
else else
color_red "Error: $SCRIPT_NAME not found!" color_red "Error:" "$SCRIPT_NAME" "not found!"
exit 1 exit 1
fi fi
;; ;;