CreatBot/CreatBotKlipperScreen
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor: allow pre-setting variables before execution in install script (#1578)

Browse Source 
* refactor: improve readability and structure of installation prompts in KlipperScreen-install.sh

* refactor: streamline user prompt and normalize input for NetworkManager installation
This commit is contained in:
Jack_up 2025-05-25 14:50:07 +02:00 committed by GitHub
parent 8aa2fcc019
commit e1aeaa6f23
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
scripts/KlipperScreen-install.sh
View File

@ -41,7 +41,8 @@ install_graphical_backend()
echo_text ""
echo "Press enter for default (Xserver)"
read -r -e -p "Backend Xserver or Wayland (cage)? [X/w]" BACKEND
if [[ "$BACKEND" =~ ^[wW]$ ]]; then
fi
if [[ "$BACKEND" =~ ^[wW]$ ]]; then
echo_text "Installing Wayland Cage Kiosk"
if sudo apt install -y $CAGE; then
echo_ok "Installed Cage"
@ -62,7 +63,6 @@ install_graphical_backend()
echo_error "Installation of X-server dependencies failed ($XSERVER)"
exit 1
fi
fi
fi
done
}
@ -293,26 +293,27 @@ install_network_manager()
if [ -z "$NETWORK" ]; then
echo "Press enter for default (Yes)"
read -r -e -p "Install NetworkManager for the network panel [Y/n]" NETWORK
if [[ $NETWORK =~ ^[nN]$ ]]; then
echo_error "Not installing NetworkManager for the network panel"
else
echo_ok "Installing NetworkManager for the network panel"
echo_text ""
echo_text "If you were not using NetworkManager"
echo_text "You will need to reconnect to the network using KlipperScreen or nmtui or nmcli"
sudo apt install network-manager
sudo mkdir -p /etc/NetworkManager/conf.d
sudo tee /etc/NetworkManager/conf.d/any-user.conf > /dev/null << EOF
fi
if [[ $NETWORK =~ ^[nN]$ ]]; then
echo_error "Not installing NetworkManager for the network panel"
else
echo_ok "Installing NetworkManager for the network panel"
echo_text ""
echo_text "If you were not using NetworkManager"
echo_text "You will need to reconnect to the network using KlipperScreen or nmtui or nmcli"
sudo apt install network-manager
sudo mkdir -p /etc/NetworkManager/conf.d
sudo tee /etc/NetworkManager/conf.d/any-user.conf > /dev/null << EOF
[main]
auth-polkit=false
EOF
sudo systemctl -q disable dhcpcd 2> /dev/null
sudo systemctl -q stop dhcpcd 2> /dev/null
sudo systemctl enable NetworkManager
sudo systemctl -q --no-block start NetworkManager
sync
systemctl reboot
fi
sudo systemctl -q disable dhcpcd 2> /dev/null
sudo systemctl -q stop dhcpcd 2> /dev/null
sudo systemctl enable NetworkManager
sudo systemctl -q --no-block start NetworkManager
sync
systemctl reboot
fi
}
@ -331,18 +332,20 @@ if [ -z "$SERVICE" ]; then
echo_text ""
echo "Press enter for default (Yes)"
read -r -e -p "[Y/n]" SERVICE
if [[ $SERVICE =~ ^[nN]$ ]]; then
echo_text "Not installing the service"
echo_text "The graphical backend will NOT be installed"
else
install_graphical_backend
install_systemd_service
if [ -z "$START" ]; then
START=1
fi
fi
if [[ $SERVICE =~ ^[nN]$ ]]; then
echo_text "Not installing the service"
echo_text "The graphical backend will NOT be installed"
else
install_graphical_backend
install_systemd_service
if [ -z "$START" ]; then
START=1
fi
fi
install_packages
create_virtualenv
create_policy