Remove fish package if not needed

pull/1/head
Lexi 2 years ago
parent a01c09c66d
commit 4c6d62971d

@ -36,11 +36,6 @@ clear
gum style --border normal --margin "1" --padding "1 2" --border-foreground 212 "Please enter your username" gum style --border normal --margin "1" --padding "1 2" --border-foreground 212 "Please enter your username"
username=$(gum input --placeholder "Please enter your username") username=$(gum input --placeholder "Please enter your username")
# Default shell
clear
gum style --border normal --margin "1" --padding "1 2" --border-foreground 212 "Select a default shell"
shell=$(gum choose --limit 1 fish zsh bash)
# User password # User password
matches="false" matches="false"
passwrong="false" passwrong="false"
@ -92,6 +87,16 @@ else
fi fi
crypt_root_password=$(openssl passwd -crypt ${root_password}) crypt_root_password=$(openssl passwd -crypt ${root_password})
# Default shell
clear
gum style --border normal --margin "1" --padding "1 2" --border-foreground 212 "Select a default shell"
shell=$(gum choose --limit 1 fish zsh bash)
if [[ "$shell" == "fish" ]]; then
fish_pkg="\"fish\""
else
fish_pkg=""
fi
# Hostname # Hostname
clear clear
gum style --border normal --margin "1" --padding "1 2" --border-foreground 212 "Please enter a hostname" gum style --border normal --margin "1" --padding "1 2" --border-foreground 212 "Please enter a hostname"
@ -186,7 +191,7 @@ else
\"desktop\": \"$desktop\", \"desktop\": \"$desktop\",
\"timeshift\": $enable_timeshift, \"timeshift\": $enable_timeshift,
\"extra_packages\": [ \"extra_packages\": [
\"fish\" $fish_pkg
], ],
\"flatpak\": $enable_flatpak, \"flatpak\": $enable_flatpak,
\"zramd\": $enable_zramd, \"zramd\": $enable_zramd,

Loading…
Cancel
Save