From 3911cf61e811c88507533eb2b81144790752e7bc Mon Sep 17 00:00:00 2001 From: hexisXz Date: Mon, 30 Sep 2024 02:14:40 +0000 Subject: [PATCH 01/14] added waterfox browser --- .../applications-setup/browsers/waterfox.sh | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 core/tabs/applications-setup/browsers/waterfox.sh diff --git a/core/tabs/applications-setup/browsers/waterfox.sh b/core/tabs/applications-setup/browsers/waterfox.sh new file mode 100644 index 00000000..8ace791b --- /dev/null +++ b/core/tabs/applications-setup/browsers/waterfox.sh @@ -0,0 +1,36 @@ +#!/bin/sh -e + + +. ../../common-script.sh + + +buildWaterfox() { + wget -O waterfox.tar.bz2 "https://cdn1.waterfox.net/waterfox/releases/latest/linux" && tar -xvjf waterfox.tar.bz2 -C ./ && rm waterfox.tar.bz2 ; sudo mkdir -p /opt/waterfox && sudo mv waterfox /opt/waterfox && cd /opt/waterfox/waterfox && sudo ln -s /opt/waterfox/waterfox/waterfox /usr/bin/waterfox +} + + +installWaterfox() { + if ! command_exists waterfox; then + printf "%b\n" "${YELLOW}Installing waterfox...${RC}" + case "$PACKAGER" in + apt-get|nala) + "$ESCALATION_TOOL" "$PACKAGER" install -y wget && buildWaterfox + ;; + zypper) + "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install wget && buildWaterfox + ;; + pacman) + "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm wget && buildWaterfox + ;; + dnf) + "$ESCALATION_TOOL" "$PACKAGER" install -y wget && buildWaterfox + ;; + *) + printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}" + exit 1 + ;; +esac + else + printf "%b\n" "${GREEN}waterfox is already installed.${RC}" + fi +} From ce764c03c73132e671fc30ced814f6e1e74bfcc4 Mon Sep 17 00:00:00 2001 From: hexisXz Date: Mon, 30 Sep 2024 02:57:04 +0000 Subject: [PATCH 02/14] added waterfox browser --- core/Cargo.toml | 2 +- core/tabs/applications-setup/tab_data.toml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/Cargo.toml b/core/Cargo.toml index 8605c94c..75a7e3b7 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "linutil_core" description = "The backend of Linutil." -repository = "https://github.com/ChrisTitusTech/linutil/tree/main/core" +repository = "https://github.com/hexisXz/linutil/tree/main/core" edition = "2021" version.workspace = true license.workspace = true diff --git a/core/tabs/applications-setup/tab_data.toml b/core/tabs/applications-setup/tab_data.toml index 141772bf..ebab844a 100644 --- a/core/tabs/applications-setup/tab_data.toml +++ b/core/tabs/applications-setup/tab_data.toml @@ -141,6 +141,12 @@ description = "Vivaldi is a freeware, cross-platform web browser developed by Vi script = "browsers/vivaldi.sh" task_list = "I" +[[data.entries]] +name = "waterfox" +description = "Waterfox is the privacy-focused web browser engineered to give you speed, control, and peace of mind on the internet." +script = "browsers/waterfox.sh" +task_list = "I" + [[data]] name = "Alacritty" description = "Alacritty is a modern terminal emulator that comes with sensible defaults, but allows for extensive configuration. By integrating with other applications, rather than reimplementing their functionality, it manages to provide a flexible set of features with high performance. The supported platforms currently consist of BSD, Linux, macOS and Windows.\nThis command installs and condifures alacritty terminal emulator." From d54333752b5402941be37c6fbe4ba1e9268af8dd Mon Sep 17 00:00:00 2001 From: hexisXz Date: Mon, 30 Sep 2024 02:58:28 +0000 Subject: [PATCH 03/14] added waterfox browser --- core/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Cargo.toml b/core/Cargo.toml index 75a7e3b7..8605c94c 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "linutil_core" description = "The backend of Linutil." -repository = "https://github.com/hexisXz/linutil/tree/main/core" +repository = "https://github.com/ChrisTitusTech/linutil/tree/main/core" edition = "2021" version.workspace = true license.workspace = true From 4fdbf65bb17e1a9d4c81393a9e883964ef6dd208 Mon Sep 17 00:00:00 2001 From: hexisXz Date: Mon, 30 Sep 2024 03:05:07 +0000 Subject: [PATCH 04/14] added waterfox browser --- core/tabs/applications-setup/browsers/waterfox.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/tabs/applications-setup/browsers/waterfox.sh b/core/tabs/applications-setup/browsers/waterfox.sh index 8ace791b..4dc42302 100644 --- a/core/tabs/applications-setup/browsers/waterfox.sh +++ b/core/tabs/applications-setup/browsers/waterfox.sh @@ -34,3 +34,5 @@ esac printf "%b\n" "${GREEN}waterfox is already installed.${RC}" fi } + +installWaterfox From 0b9ba635a931f7a7e3ba4c03196f45ad73cc1a58 Mon Sep 17 00:00:00 2001 From: hexisXz Date: Mon, 30 Sep 2024 03:08:12 +0000 Subject: [PATCH 05/14] added waterfox browser --- core/tabs/applications-setup/browsers/waterfox.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/tabs/applications-setup/browsers/waterfox.sh b/core/tabs/applications-setup/browsers/waterfox.sh index 4dc42302..2ba58cab 100644 --- a/core/tabs/applications-setup/browsers/waterfox.sh +++ b/core/tabs/applications-setup/browsers/waterfox.sh @@ -35,4 +35,6 @@ esac fi } +checkEnv +checkEscalationTool installWaterfox From 054acfab1ed5ad6e161a3ed7ea9d3e51b0ce3ba2 Mon Sep 17 00:00:00 2001 From: hexisXz Date: Mon, 30 Sep 2024 03:59:05 +0000 Subject: [PATCH 06/14] added waterfox browser --- .../applications-setup/browsers/waterfox.sh | 51 +++++++++---------- 1 file changed, 23 insertions(+), 28 deletions(-) diff --git a/core/tabs/applications-setup/browsers/waterfox.sh b/core/tabs/applications-setup/browsers/waterfox.sh index 2ba58cab..48b6e784 100644 --- a/core/tabs/applications-setup/browsers/waterfox.sh +++ b/core/tabs/applications-setup/browsers/waterfox.sh @@ -1,37 +1,32 @@ #!/bin/sh -e - . ../../common-script.sh - -buildWaterfox() { - wget -O waterfox.tar.bz2 "https://cdn1.waterfox.net/waterfox/releases/latest/linux" && tar -xvjf waterfox.tar.bz2 -C ./ && rm waterfox.tar.bz2 ; sudo mkdir -p /opt/waterfox && sudo mv waterfox /opt/waterfox && cd /opt/waterfox/waterfox && sudo ln -s /opt/waterfox/waterfox/waterfox /usr/bin/waterfox -} - - installWaterfox() { - if ! command_exists waterfox; then - printf "%b\n" "${YELLOW}Installing waterfox...${RC}" - case "$PACKAGER" in - apt-get|nala) - "$ESCALATION_TOOL" "$PACKAGER" install -y wget && buildWaterfox - ;; - zypper) - "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install wget && buildWaterfox - ;; - pacman) - "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm wget && buildWaterfox - ;; - dnf) - "$ESCALATION_TOOL" "$PACKAGER" install -y wget && buildWaterfox - ;; - *) - printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}" - exit 1 - ;; -esac + buildWaterfox=$(curl -L -o waterfox.tar.bz2 "https://cdn1.waterfox.net/waterfox/releases/latest/linux" && tar -xvjf waterfox.tar.bz2 -C ./ && rm waterfox.tar.bz2 ; sudo mkdir -p /opt/waterfox && sudo mv waterfox /opt/waterfox && cd /opt/waterfox/waterfox && sudo ln -s /opt/waterfox/waterfox/waterfox /usr/bin/waterfox) + + if ! command_exists firefox; then + printf "%b\n" "${YELLOW}Installing waterfox...${RC}" + case "$PACKAGER" in + apt-get|nala) + "$ESCALATION_TOOL" "$PACKAGER" install -y curl && printf("$buildWaterfox") + ;; + zypper) + "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install curl && printf("$buildWaterfox") + ;; + pacman) + "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm curl && printf("$buildWaterfox") + ;; + dnf) + "$ESCALATION_TOOL" "$PACKAGER" install -y curl && printf("$buildWaterfox") + ;; + *) + printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}" + exit 1 + ;; + esac else - printf "%b\n" "${GREEN}waterfox is already installed.${RC}" + printf "%b\n" "${GREEN}Waterfox Browser is already installed.${RC}" fi } From 9511a7d2c17ebb447046762d68b48d646c6d5ce7 Mon Sep 17 00:00:00 2001 From: hexisXz Date: Mon, 30 Sep 2024 04:04:33 +0000 Subject: [PATCH 07/14] added waterfox browser --- core/tabs/applications-setup/browsers/waterfox.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/tabs/applications-setup/browsers/waterfox.sh b/core/tabs/applications-setup/browsers/waterfox.sh index 48b6e784..f8401675 100644 --- a/core/tabs/applications-setup/browsers/waterfox.sh +++ b/core/tabs/applications-setup/browsers/waterfox.sh @@ -5,7 +5,7 @@ installWaterfox() { buildWaterfox=$(curl -L -o waterfox.tar.bz2 "https://cdn1.waterfox.net/waterfox/releases/latest/linux" && tar -xvjf waterfox.tar.bz2 -C ./ && rm waterfox.tar.bz2 ; sudo mkdir -p /opt/waterfox && sudo mv waterfox /opt/waterfox && cd /opt/waterfox/waterfox && sudo ln -s /opt/waterfox/waterfox/waterfox /usr/bin/waterfox) - if ! command_exists firefox; then + if ! command_exists waterfox; then printf "%b\n" "${YELLOW}Installing waterfox...${RC}" case "$PACKAGER" in apt-get|nala) From 8bfd5367fb6b0a560635886c2846a596b0b01cc6 Mon Sep 17 00:00:00 2001 From: hexisXz Date: Mon, 30 Sep 2024 04:07:43 +0000 Subject: [PATCH 08/14] added waterfox browser --- core/tabs/applications-setup/browsers/waterfox.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/tabs/applications-setup/browsers/waterfox.sh b/core/tabs/applications-setup/browsers/waterfox.sh index f8401675..04b5a4b2 100644 --- a/core/tabs/applications-setup/browsers/waterfox.sh +++ b/core/tabs/applications-setup/browsers/waterfox.sh @@ -9,16 +9,16 @@ installWaterfox() { printf "%b\n" "${YELLOW}Installing waterfox...${RC}" case "$PACKAGER" in apt-get|nala) - "$ESCALATION_TOOL" "$PACKAGER" install -y curl && printf("$buildWaterfox") + "$ESCALATION_TOOL" "$PACKAGER" install -y curl && printf "$buildWaterfox" ;; zypper) - "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install curl && printf("$buildWaterfox") + "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install curl && printf "$buildWaterfox" ;; pacman) - "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm curl && printf("$buildWaterfox") + "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm curl && printf "$buildWaterfox" ;; dnf) - "$ESCALATION_TOOL" "$PACKAGER" install -y curl && printf("$buildWaterfox") + "$ESCALATION_TOOL" "$PACKAGER" install -y curl && printf "$buildWaterfox" ;; *) printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}" From c0728e1b106f6925664f25edc5c5ef228931ca73 Mon Sep 17 00:00:00 2001 From: hexisXz Date: Mon, 30 Sep 2024 04:31:44 +0000 Subject: [PATCH 09/14] fixed things --- core/tabs/applications-setup/browsers/waterfox.sh | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/core/tabs/applications-setup/browsers/waterfox.sh b/core/tabs/applications-setup/browsers/waterfox.sh index 04b5a4b2..4a95c2ba 100644 --- a/core/tabs/applications-setup/browsers/waterfox.sh +++ b/core/tabs/applications-setup/browsers/waterfox.sh @@ -8,28 +8,20 @@ installWaterfox() { if ! command_exists waterfox; then printf "%b\n" "${YELLOW}Installing waterfox...${RC}" case "$PACKAGER" in - apt-get|nala) - "$ESCALATION_TOOL" "$PACKAGER" install -y curl && printf "$buildWaterfox" - ;; - zypper) - "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install curl && printf "$buildWaterfox" - ;; pacman) "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm curl && printf "$buildWaterfox" ;; - dnf) - "$ESCALATION_TOOL" "$PACKAGER" install -y curl && printf "$buildWaterfox" - ;; *) printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}" exit 1 ;; esac else - printf "%b\n" "${GREEN}Waterfox Browser is already installed.${RC}" + printf "%b\n" "${GREEN}Waterfox is already installed.${RC}" fi } checkEnv checkEscalationTool +checkAURHelper installWaterfox From f2526b048e586a5811c75eb1650d564e2077a8e9 Mon Sep 17 00:00:00 2001 From: hexisXz Date: Mon, 30 Sep 2024 04:41:55 +0000 Subject: [PATCH 10/14] fixed things --- core/tabs/applications-setup/browsers/waterfox.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/core/tabs/applications-setup/browsers/waterfox.sh b/core/tabs/applications-setup/browsers/waterfox.sh index 4a95c2ba..372d102c 100644 --- a/core/tabs/applications-setup/browsers/waterfox.sh +++ b/core/tabs/applications-setup/browsers/waterfox.sh @@ -3,17 +3,15 @@ . ../../common-script.sh installWaterfox() { - buildWaterfox=$(curl -L -o waterfox.tar.bz2 "https://cdn1.waterfox.net/waterfox/releases/latest/linux" && tar -xvjf waterfox.tar.bz2 -C ./ && rm waterfox.tar.bz2 ; sudo mkdir -p /opt/waterfox && sudo mv waterfox /opt/waterfox && cd /opt/waterfox/waterfox && sudo ln -s /opt/waterfox/waterfox/waterfox /usr/bin/waterfox) - if ! command_exists waterfox; then printf "%b\n" "${YELLOW}Installing waterfox...${RC}" case "$PACKAGER" in pacman) - "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm curl && printf "$buildWaterfox" + "$AUR_HELPER" -S --needed --noconfirm waterfox-bin ;; *) - printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}" - exit 1 + . ./setup-flatpak.sh + flatpak install -y flathub net.waterfox.waterfox ;; esac else From 6bde17648a2d17cb3a5f76e0df535ab635830fb8 Mon Sep 17 00:00:00 2001 From: hexisXz Date: Mon, 30 Sep 2024 04:50:22 +0000 Subject: [PATCH 11/14] added FI --- core/tabs/applications-setup/tab_data.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/tabs/applications-setup/tab_data.toml b/core/tabs/applications-setup/tab_data.toml index ebab844a..752163a9 100644 --- a/core/tabs/applications-setup/tab_data.toml +++ b/core/tabs/applications-setup/tab_data.toml @@ -145,7 +145,7 @@ task_list = "I" name = "waterfox" description = "Waterfox is the privacy-focused web browser engineered to give you speed, control, and peace of mind on the internet." script = "browsers/waterfox.sh" -task_list = "I" +task_list = "FI" [[data]] name = "Alacritty" From 36d65e5e636102cbcc31abd64840a722725199ec Mon Sep 17 00:00:00 2001 From: hexisXz Date: Mon, 30 Sep 2024 14:45:15 +0000 Subject: [PATCH 12/14] flatpak fix --- core/tabs/applications-setup/browsers/waterfox.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/tabs/applications-setup/browsers/waterfox.sh b/core/tabs/applications-setup/browsers/waterfox.sh index 372d102c..3cef5106 100644 --- a/core/tabs/applications-setup/browsers/waterfox.sh +++ b/core/tabs/applications-setup/browsers/waterfox.sh @@ -10,7 +10,7 @@ installWaterfox() { "$AUR_HELPER" -S --needed --noconfirm waterfox-bin ;; *) - . ./setup-flatpak.sh + . ../setup-flatpak.sh flatpak install -y flathub net.waterfox.waterfox ;; esac From ff26cb159ca2420f331965e5ee88ded5ea091c0b Mon Sep 17 00:00:00 2001 From: hexisXz Date: Tue, 1 Oct 2024 22:36:55 +0000 Subject: [PATCH 13/14] added lapce IDE --- .../Developer-tools/lapce.sh | 25 +++++++++++++++++++ core/tabs/applications-setup/tab_data.toml | 6 +++++ 2 files changed, 31 insertions(+) create mode 100644 core/tabs/applications-setup/Developer-tools/lapce.sh diff --git a/core/tabs/applications-setup/Developer-tools/lapce.sh b/core/tabs/applications-setup/Developer-tools/lapce.sh new file mode 100644 index 00000000..861fb4f0 --- /dev/null +++ b/core/tabs/applications-setup/Developer-tools/lapce.sh @@ -0,0 +1,25 @@ +#!/bin/sh -e + +. ../../common-script.sh + +installLapce() { + if ! command_exists lapce; then + printf "%b\n" "${YELLOW}Installing Lapce...${RC}" + case "$PACKAGER" in + pacman) + "$AUR_HELPER" -S --needed --noconfirm lapce + ;; + *) + . ../setup-flatpak.sh + flatpak install flathub dev.lapce.lapce + ;; + esac + else + printf "%b\n" "${GREEN}Lapce is already installed.${RC}" + fi +} + +checkEnv +checkEscalationTool +checkAURHelper +installLapce diff --git a/core/tabs/applications-setup/tab_data.toml b/core/tabs/applications-setup/tab_data.toml index 752163a9..5a56d47a 100644 --- a/core/tabs/applications-setup/tab_data.toml +++ b/core/tabs/applications-setup/tab_data.toml @@ -27,6 +27,12 @@ description = "Visual Studio Code (VS Code) is a lightweight, open-source code e script = "Developer-tools/vscode-setup.sh" task_list = "I" +[[data.entries]] +name = "Lapce" +description = "Lapce is an open source code editor written in Rust." +script = "Developer-tools/lapce.sh" +task_list = "FI" + [[data.entries]] name = "VS Codium" description = "VSCodium is a free, open-source version of Visual Studio Code (VS Code) that removes Microsoft-specific telemetry and branding." From b7ae5028997b1247f04a89f554969cd79aef89d6 Mon Sep 17 00:00:00 2001 From: hexisXz Date: Tue, 1 Oct 2024 22:58:03 +0000 Subject: [PATCH 14/14] . --- .../Developer-tools/lapce.sh | 25 ------------------- core/tabs/applications-setup/tab_data.toml | 6 ----- 2 files changed, 31 deletions(-) delete mode 100644 core/tabs/applications-setup/Developer-tools/lapce.sh diff --git a/core/tabs/applications-setup/Developer-tools/lapce.sh b/core/tabs/applications-setup/Developer-tools/lapce.sh deleted file mode 100644 index 861fb4f0..00000000 --- a/core/tabs/applications-setup/Developer-tools/lapce.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -e - -. ../../common-script.sh - -installLapce() { - if ! command_exists lapce; then - printf "%b\n" "${YELLOW}Installing Lapce...${RC}" - case "$PACKAGER" in - pacman) - "$AUR_HELPER" -S --needed --noconfirm lapce - ;; - *) - . ../setup-flatpak.sh - flatpak install flathub dev.lapce.lapce - ;; - esac - else - printf "%b\n" "${GREEN}Lapce is already installed.${RC}" - fi -} - -checkEnv -checkEscalationTool -checkAURHelper -installLapce diff --git a/core/tabs/applications-setup/tab_data.toml b/core/tabs/applications-setup/tab_data.toml index 5a56d47a..752163a9 100644 --- a/core/tabs/applications-setup/tab_data.toml +++ b/core/tabs/applications-setup/tab_data.toml @@ -27,12 +27,6 @@ description = "Visual Studio Code (VS Code) is a lightweight, open-source code e script = "Developer-tools/vscode-setup.sh" task_list = "I" -[[data.entries]] -name = "Lapce" -description = "Lapce is an open source code editor written in Rust." -script = "Developer-tools/lapce.sh" -task_list = "FI" - [[data.entries]] name = "VS Codium" description = "VSCodium is a free, open-source version of Visual Studio Code (VS Code) that removes Microsoft-specific telemetry and branding."