From 82719d3f5e8cbe5e952cbc6fc0f15eadb4946d2e Mon Sep 17 00:00:00 2001 From: leventbesli Date: Tue, 1 Oct 2024 16:01:08 +0300 Subject: [PATCH] Fixed Vivaldi Setup Lynx install script replaced with Vivaldi. --- Cargo.lock | 4 +-- .../applications-setup/browsers/vivaldi.sh | 28 +++++++++++++------ 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1ff46393..c33834f6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -491,7 +491,7 @@ checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "linutil_core" -version = "24.9.23" +version = "24.9.28" dependencies = [ "ego-tree", "include_dir", @@ -503,7 +503,7 @@ dependencies = [ [[package]] name = "linutil_tui" -version = "24.9.23" +version = "24.9.28" dependencies = [ "ansi-to-tui", "anstyle", diff --git a/core/tabs/applications-setup/browsers/vivaldi.sh b/core/tabs/applications-setup/browsers/vivaldi.sh index 002ff7e3..b55aa0af 100644 --- a/core/tabs/applications-setup/browsers/vivaldi.sh +++ b/core/tabs/applications-setup/browsers/vivaldi.sh @@ -2,22 +2,32 @@ . ../../common-script.sh -installLynx() { - if ! command_exists lynx; then - printf "%b\n" "${YELLOW}Installing Lynx...${RC}" - case "$PACKAGER" in - pacman) - "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm lynx +installVivaldi() { + if ! command_exists vivaldi; then + printf "%b\n" "${YELLOW}Installing Vivaldi...${RC}" +case "$PACKAGER" in + apt-get|nala) + "$ESCALATION_TOOL" "$PACKAGER" install -y curl + "$ESCALATION_TOOL" curl -fsSL https://repo.vivaldi.com/archive/linux_signing_key.pub | gpg --dearmor | sudo dd of=/usr/share/keyrings/vivaldi-browser.gpg + "$ESCALATION_TOOL" echo "deb [signed-by=/usr/share/keyrings/vivaldi-browser.gpg arch=$(dpkg --print-architecture)] https://repo.vivaldi.com/archive/deb/ stable main" | sudo dd of=/etc/apt/sources.list.d/vivaldi-archive.list + "$ESCALATION_TOOL" "$PACKAGER" update + "$ESCALATION_TOOL" "$PACKAGER" install -y vivaldi-stable + ;; + dnf) + "$ESCALATION_TOOL" "$PACKAGER" install -y dnf-plugins-core + "$ESCALATION_TOOL" "$PACKAGER" config-manager --add-repo https://repo.vivaldi.com/stable/vivaldi-fedora.repo + "$ESCALATION_TOOL" "$PACKAGER" install -y vivaldi-stable ;; *) - "$ESCALATION_TOOL" "$PACKAGER" install -y lynx + printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}" + exit 1 ;; esac else - printf "%b\n" "${GREEN}Lynx TUI Browser is already installed.${RC}" + printf "%b\n" "${GREEN}Vivaldi Browser is already installed.${RC}" fi } checkEnv checkEscalationTool -installLynx \ No newline at end of file +installVivaldi