Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/tabs/applications-setup/browsers/firefox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ installFirefox() {
pacman)
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm firefox
;;
dnf)
"$ESCALATION_TOOL" "$PACKAGER" install -y firefox
dnf|eopkg)
"$ESCALATION_TOOL" "$PACKAGER" -y install firefox
;;
xbps-install)
"$ESCALATION_TOOL" "$PACKAGER" -Sy firefox
Expand Down
5 changes: 1 addition & 4 deletions core/tabs/applications-setup/browsers/tor-browser.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ installTorBrowser() {
if ! command_exists torbrowser-launcher; then
printf "%b\n" "${YELLOW}Installing Tor Browser...${RC}"
case "$PACKAGER" in
apt-get|nala)
apt-get|nala|dnf|eopkg)
"$ESCALATION_TOOL" "$PACKAGER" install -y torbrowser-launcher
;;
zypper)
Expand All @@ -15,9 +15,6 @@ installTorBrowser() {
pacman)
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm torbrowser-launcher
;;
dnf)
"$ESCALATION_TOOL" "$PACKAGER" install -y torbrowser-launcher
;;
xbps-install)
"$ESCALATION_TOOL" "$PACKAGER" -Sy torbrowser-launcher
;;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ installDiscord() {
curl -Lo discord.deb "https://discord.com/api/download?platform=linux&format=deb"
"$ESCALATION_TOOL" "$PACKAGER" install -y discord.deb
;;
zypper)
"$ESCALATION_TOOL" "$PACKAGER" --non-interactive install discord
zypper|eopkg)
"$ESCALATION_TOOL" "$PACKAGER" install -y discord
;;
pacman)
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm discord
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ installSignal() {
"$ESCALATION_TOOL" "$PACKAGER" update
"$ESCALATION_TOOL" "$PACKAGER" -y install signal-desktop
;;
zypper)
"$ESCALATION_TOOL" "$PACKAGER" --non-interactive install signal-desktop
zypper|eopkg)
"$ESCALATION_TOOL" "$PACKAGER" install -y signal-desktop
;;
pacman)
"$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm signal-desktop
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ installTelegram() {
xbps-install)
"$ESCALATION_TOOL" "$PACKAGER" -Sy telegram-desktop
;;
eopkg)
"$ESCALATION_TOOL" "$PACKAGER" install -y telegram
;;
*)
"$ESCALATION_TOOL" "$PACKAGER" install -y telegram-desktop
;;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ installJetBrainsToolBox() {
pacman)
"$AUR_HELPER" -S --needed --noconfirm jetbrains-toolbox
;;
dnf)
dnf|eopkg)
manualInstall
;;
xbps-install)
Expand Down
2 changes: 1 addition & 1 deletion core/tabs/applications-setup/developer-tools/meld.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ installMeld() {
pacman)
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm meld
;;
apt-get|nala)
apt-get|nala|eopkg)
"$ESCALATION_TOOL" "$PACKAGER" -y install meld
;;
apk)
Expand Down
3 changes: 3 additions & 0 deletions core/tabs/applications-setup/developer-tools/neovim.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ installNeovim() {
xbps-install)
"$ESCALATION_TOOL" "$PACKAGER" -Sy neovim ripgrep fzf python3-virtualenv luarocks go shellcheck git
;;
eopkg)
"$ESCALATION_TOOL" "$PACKAGER" install -y neovim ripgrep fzf virtualenv luarocks golang shellcheck git
;;
*)
printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
exit 1
Expand Down
3 changes: 3 additions & 0 deletions core/tabs/applications-setup/developer-tools/vscode.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ installVsCode() {
xbps-install)
"$ESCALATION_TOOL" "$PACKAGER" -Sy vscode
;;
eopkg)
"$ESCALATION_TOOL" "$PACKAGER" -y install vscode
;;
apk)
checkFlatpak
flatpak install -y flathub com.visualstudio.code
Expand Down
2 changes: 1 addition & 1 deletion core/tabs/applications-setup/developer-tools/vscodium.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ installVsCodium() {
printf "%b\n" "[gitlab.com_paulcarroty_vscodium_repo]\nname=download.vscodium.com\nbaseurl=https://download.vscodium.com/rpms/\nenabled=1\ngpgcheck=1\nrepo_gpgcheck=1\ngpgkey=https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/-/raw/master/pub.gpg\nmetadata_expire=1h" | "$ESCALATION_TOOL" tee -a /etc/yum.repos.d/vscodium.repo
"$ESCALATION_TOOL" "$PACKAGER" install -y codium
;;
apk)
apk|xbps-install|eopkg)
checkFlatpak
flatpak install -y flathub com.vscodium.codium
;;
Expand Down
3 changes: 3 additions & 0 deletions core/tabs/applications-setup/developer-tools/zed.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ installZed() {
"$ESCALATION_TOOL" "$PACKAGER" addrepo -f https://download.opensuse.org/repositories/editors/openSUSE_Tumbleweed/editors.repo
"$ESCALATION_TOOL" "$PACKAGER" install -y zed
;;
eopkg)
"$ESCALATION_TOOL" "$PACKAGER" install -y zed
;;
*)
printf "%b\n" "${YELLOW}No official package found for package manager $PACKAGER. Do you want to install flathub package or from source?${RC}"
printf "%b\n" "1) Flathub package"
Expand Down
8 changes: 4 additions & 4 deletions core/tabs/applications-setup/docker-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ install_docker() {
"$ESCALATION_TOOL" "$PACKAGER" -y install docker-ce docker-ce-cli containerd.io docker-buildx-plugin
"$ESCALATION_TOOL" systemctl enable --now docker
;;
zypper)
"$ESCALATION_TOOL" "$PACKAGER" --non-interactive install docker
zypper|eopkg)
"$ESCALATION_TOOL" "$PACKAGER" install -y docker
;;
pacman)
"$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm docker
Expand Down Expand Up @@ -74,8 +74,8 @@ install_docker_compose() {
fi
"$ESCALATION_TOOL" "$PACKAGER" install -y docker-compose-plugin
;;
zypper)
"$ESCALATION_TOOL" "$PACKAGER" --non-interactive install docker-compose
zypper|eopkg)
"$ESCALATION_TOOL" "$PACKAGER" install -y docker-compose
;;
pacman)
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm docker-compose
Expand Down
14 changes: 13 additions & 1 deletion core/tabs/applications-setup/dwmtitus-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ setupDWM() {
xbps-install)
"$ESCALATION_TOOL" "$PACKAGER" -Sy base-devel freetype-devel fontconfig-devel imlib2-devel libXft-devel libXinerama-devel git unzip flameshot lxappearance feh mate-polkit
;;
eopkg)
"$ESCALATION_TOOL" "$PACKAGER" install -y -c system.devel
"$ESCALATION_TOOL" "$PACKAGER" install -y libxcb-devel libxinerama-devel libxft-devel imlib2-devel git unzip flameshot lxappearance feh mate-polkit xcb-util-devel
;;
*)
printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
exit 1
Expand Down Expand Up @@ -54,6 +58,9 @@ setupPicomDependencies() {
xbps-install)
"$ESCALATION_TOOL" "$PACKAGER" -Sy meson libev-devel uthash libconfig-devel pixman-devel xcb-util-image-devel xcb-util-renderutil-devel pcre2-devel libepoxy-devel dbus-devel
;;
eopkg)
"$ESCALATION_TOOL" "$PACKAGER" install -y libxcb-devel meson libev-devel uthash-devel libconfig-devel pixman-devel xcb-util-image-devel xcb-util-renderutil-devel pcre2-devel libepoxy-devel dbus-devel xcb-util-devel
;;
*)
printf "%b\n" "${RED}Unsupported package manager: $PACKAGER${RC}"
exit 1
Expand All @@ -74,7 +81,6 @@ install_nerd_font() {
# Check to see if the MesloLGS Nerd Font is installed (Change this to whatever font you would like)
FONT_NAME="MesloLGS Nerd Font Mono"
FONT_DIR="$HOME/.local/share/fonts"
FONT_ZIP="$FONT_DIR/Meslo.zip"
FONT_URL="https://github.com/ryanoasis/nerd-fonts/releases/latest/download/Meslo.zip"
FONT_INSTALLED=$(fc-list | grep -i "Meslo")

Expand Down Expand Up @@ -214,6 +220,9 @@ setupDisplayManager() {
xbps-install)
"$ESCALATION_TOOL" "$PACKAGER" -Sy xorg-minimal
;;
eopkg)
"$ESCALATION_TOOL" "$PACKAGER" install -y xorg-server xinit
;;
*)
printf "%b\n" "${RED}Unsupported package manager: $PACKAGER${RC}"
exit 1
Expand Down Expand Up @@ -285,6 +294,9 @@ setupDisplayManager() {
"$ESCALATION_TOOL" "$PACKAGER" -Sy lightdm-gtk-greeter
fi
;;
eopkg)
"$ESCALATION_TOOL" "$PACKAGER" install -y "$DM"
;;
*)
printf "%b\n" "${RED}Unsupported package manager: $PACKAGER${RC}"
exit 1
Expand Down
14 changes: 11 additions & 3 deletions core/tabs/applications-setup/mybash-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,18 @@ installStarshipAndFzf() {
return
fi

if ! curl -sSL https://starship.rs/install.sh | "$ESCALATION_TOOL" sh; then
printf "%b\n" "${RED}Something went wrong during starship install!${RC}"
exit 1
if [ "$PACKAGER" = "eopkg" ]; then
"$ESCALATION_TOOL" "$PACKAGER" install -y starship || {
printf "%b\n" "${RED}Failed to install starship with Solus!${RC}"
exit 1
}
else
curl -sSL https://starship.rs/install.sh | "$ESCALATION_TOOL" sh || {
printf "%b\n" "${RED}Failed to install starship!${RC}"
exit 1
}
fi

if command_exists fzf; then
printf "%b\n" "${GREEN}Fzf already installed${RC}"
else
Expand Down
3 changes: 3 additions & 0 deletions core/tabs/applications-setup/office-suites/libreoffice.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ installLibreOffice() {
xbps-install)
"$ESCALATION_TOOL" "$PACKAGER" -Sy libreoffice
;;
eopkg)
"$ESCALATION_TOOL" "$PACKAGER" -y install libreoffice
;;
*)
printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
exit 1
Expand Down
4 changes: 2 additions & 2 deletions core/tabs/applications-setup/office-suites/onlyoffice.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ installOnlyOffice() {
curl -O https://download.onlyoffice.com/install/desktop/editors/linux/onlyoffice-desktopeditors_amd64.deb
"$ESCALATION_TOOL" "$PACKAGER" install -y ./onlyoffice-desktopeditors_amd64.deb
;;
zypper|dnf)
zypper|dnf|xbps-install|eopkg|apk)
checkFlatpak
flatpak install -y flathub org.onlyoffice.desktopeditors
"$ESCALATION_TOOL" flatpak install -y flathub org.onlyoffice.desktopeditors
;;
pacman)
"$AUR_HELPER" -S --needed --noconfirm onlyoffice
Expand Down
2 changes: 1 addition & 1 deletion core/tabs/common-script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ checkEnv() {
checkArch
checkEscalationTool
checkCommandRequirements "curl groups $ESCALATION_TOOL"
checkPackageManager 'nala apt-get dnf pacman zypper apk xbps-install'
checkPackageManager 'nala apt-get dnf pacman zypper apk xbps-install eopkg'
checkCurrentDirectoryWritable
checkSuperUser
checkDistro
Expand Down
7 changes: 7 additions & 0 deletions core/tabs/system-setup/compile-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,15 @@
"$ESCALATION_TOOL" "$PACKAGER" -Sy void-repo-multilib
"$ESCALATION_TOOL" "$PACKAGER" -Sy glibc-32bit gcc-multilib
;;
eopkg)
# shellcheck disable=SC2086
COMPILEDEPS='-c system.devel'
"$ESCALATION_TOOL" "$PACKAGER" update-repo
"$ESCALATION_TOOL" "$PACKAGER" install -y tar tree unzip cmake make jq
""$ESCALATION_TOOL" "$PACKAGER" "$COMPILEDEPS"

Check warning on line 60 in core/tabs/system-setup/compile-setup.sh

View workflow job for this annotation

GitHub Actions / Shellcheck

[shellcheck] reported by reviewdog 🐶 The mentioned syntax error was in this simple command. Raw Output: ./core/tabs/system-setup/compile-setup.sh:60:13: info: The mentioned syntax error was in this simple command. (ShellCheck.SC1009)
;;
*)
"$ESCALATION_TOOL" "$PACKAGER" install -y "$DEPENDENCIES"

Check failure on line 63 in core/tabs/system-setup/compile-setup.sh

View workflow job for this annotation

GitHub Actions / Shellcheck

[shellcheck] reported by reviewdog 🐶 Couldn't parse this double quoted string. Fix to allow more checks. Raw Output: ./core/tabs/system-setup/compile-setup.sh:63:69: error: Couldn't parse this double quoted string. Fix to allow more checks. (ShellCheck.SC1073)
;;
esac
}
Expand All @@ -62,3 +69,3 @@
checkAURHelper
checkEscalationTool
installDepend
9 changes: 9 additions & 0 deletions core/tabs/system-setup/gaming-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ installDepend() {
zypper)
"$ESCALATION_TOOL" "$PACKAGER" -n install $DEPENDENCIES
;;
eopkg)
DISTRO_DEPS="libgnutls libgtk-2 libgtk-3 pulseaudio alsa-lib alsa-plugins giflib libpng openal-soft libxcomposite libxinerama ncurses vulkan ocl-icd libva gst-plugins-base sdl2 v4l-utils sqlite3"

"$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES $DISTRO_DEPS
;;
*)
printf "%b\n" "${RED}Unsupported package manager ${PACKAGER}${RC}"
exit 1
Expand Down Expand Up @@ -98,6 +103,10 @@ installAdditionalDepend() {
DISTRO_DEPS='lutris'
"$ESCALATION_TOOL" "$PACKAGER" -n install $DISTRO_DEPS
;;
eopkg)
DISTRO_DEPS='steam lutris'
"$ESCALATION_TOOL" "$PACKAGER" install -y $DISTRO_DEPS
;;
*)
printf "%b\n" "${RED}Unsupported package manager ${PACKAGER}${RC}"
exit 1
Expand Down
3 changes: 3 additions & 0 deletions core/tabs/system-setup/system-cleanup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ cleanup_system() {
xbps-install)
"$ESCALATION_TOOL" xbps-remove -Ooy
;;
eopkg)
"$ESCALATION_TOOL" "$PACKAGER" -y remove-orphans
;;
*)
printf "%b\n" "${RED}Unsupported package manager: ${PACKAGER}. Skipping.${RC}"
;;
Expand Down
8 changes: 4 additions & 4 deletions core/tabs/system-setup/system-update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ fastUpdate() {
xbps-install)
"$ESCALATION_TOOL" "$PACKAGER" -S
;;
eopkg)
"$ESCALATION_TOOL" "$PACKAGER" -y update-repo
;;
*)
printf "%b\n" "${RED}Unsupported package manager: ${PACKAGER}${RC}"
exit 1
Expand All @@ -69,10 +72,7 @@ fastUpdate() {
updateSystem() {
printf "%b\n" "${YELLOW}Updating system packages.${RC}"
case "$PACKAGER" in
apt-get|nala)
"$ESCALATION_TOOL" "$PACKAGER" upgrade -y
;;
dnf)
apt-get|nala|dnf|eopkg)
"$ESCALATION_TOOL" "$PACKAGER" upgrade -y
;;
pacman)
Expand Down
24 changes: 21 additions & 3 deletions core/tabs/system-setup/terminus-tty.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/sh -e

. ../common-script.sh

InstallTermiusFonts() {
if [ ! -f "/usr/share/kbd/consolefonts/ter-c18b.psf.gz" ] &&
[ ! -f "/usr/share/consolefonts/Uni3-TerminusBold18x10.psf.gz" ] &&
Expand All @@ -15,10 +16,19 @@ InstallTermiusFonts() {
;;
dnf)
"$ESCALATION_TOOL" "$PACKAGER" install -y terminus-fonts-console
;;
;;
xbps-install)
"$ESCALATION_TOOL" "$PACKAGER" -Sy terminus-font
;;
eopkg)
"$ESCALATION_TOOL" "$PACKAGER" install -y font-terminus-console
;;
zypper)
"$ESCALATION_TOOL" "$PACKAGER" install -y terminus-bitmap-fonts
;;
apk)
"$ESCALATION_TOOL" "$PACKAGER" add font-terminus
;;
*)
printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
exit 1
Expand All @@ -31,16 +41,24 @@ InstallTermiusFonts() {

SetTermiusFonts() {
case "$DTYPE" in
arch|fedora|void)
arch|fedora|void|solus|opensuse-*)
printf "%b\n" "${YELLOW}Updating FONT= line in /etc/vconsole.conf...${RC}"
"$ESCALATION_TOOL" sed -i 's/^FONT=.*/FONT=ter-v32b/' /etc/vconsole.conf
if [ -z "$DISPLAY" ] && [ -z "$WAYLAND_DISPLAY" ]; then
"$ESCALATION_TOOL" setfont -C /dev/tty1 ter-v32b
fi
printf "%b\n" "${GREEN}Terminus font set for TTY.${RC}"
;;
alpine)
printf "%b\n" "${YELLOW}Updating console font configuration for Alpine...${RC}"
if [ -z "$DISPLAY" ] && [ -z "$WAYLAND_DISPLAY" ]; then
"$ESCALATION_TOOL" setfont -C /dev/tty1 /usr/share/consolefonts/ter-v32b.psf.gz
fi
echo 'consolefont="/usr/share/consolefonts/ter-v32b.psf.gz"' | "$ESCALATION_TOOL" tee /etc/conf.d/consolefont > /dev/null
"$ESCALATION_TOOL" rc-update add consolefont boot
printf "%b\n" "${GREEN}Terminus font set for TTY.${RC}"
;;
debian)

printf "%b\n" "${YELLOW}Updating console-setup configuration...${RC}"
"$ESCALATION_TOOL" sed -i 's/^CODESET=.*/CODESET="guess"/' /etc/default/console-setup
"$ESCALATION_TOOL" sed -i 's/^FONTFACE=.*/FONTFACE="TerminusBold"/' /etc/default/console-setup
Expand Down
5 changes: 1 addition & 4 deletions core/tabs/utils/encrypt_decrypt_tool.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ if ! command_exists openssl; then
pacman)
"$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm --needed openssl
;;
apt-get|nala)
"$ESCALATION_TOOL" "$PACKAGER" install -y openssl
;;
dnf)
apt-get|nala|dnf|eopkg)
"$ESCALATION_TOOL" "$PACKAGER" install -y openssl
;;
zypper)
Expand Down
2 changes: 1 addition & 1 deletion core/tabs/utils/printers/install-cups.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ installCUPS() {
pacman)
"$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm cups
;;
apt-get|nala|dnf)
apt-get|nala|dnf|eopkg)
"$ESCALATION_TOOL" "$PACKAGER" install -y cups
;;
xbps-install)
Expand Down
2 changes: 1 addition & 1 deletion core/tabs/utils/printers/install-epson-printer-drivers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ installEpsonPrinterDriver() {
apt-get|nala)
"$ESCALATION_TOOL" "$PACKAGER" install -y printer-driver-escpr
;;
dnf)
dnf|eopkg)
"$ESCALATION_TOOL" "$PACKAGER" install -y epson-inkjet-printer-escpr
;;
xbps-install)
Expand Down
Loading
Loading