Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issues with packager #442

Closed
wants to merge 3 commits into from
Closed

Fix issues with packager #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a91e7d
Fix issues with packager
nnyyxxxx Sep 17, 2024
ed17561
Fix extra quotes
nnyyxxxx Sep 17, 2024
4404169
Fix remaining packagers
nnyyxxxx Sep 17, 2024
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
6 changes: 3 additions & 3 deletions tabs/applications-setup/alacritty-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
setupAlacritty() {
echo "Install Alacritty if not already installed..."
if ! command_exists alacritty; then
case ${PACKAGER} in
case "$PACKAGER" in
pacman)
$ESCALATION_TOOL ${PACKAGER} -S --needed --noconfirm alacritty
$ESCALATION_TOOL "$PACKAGER" -S --needed --noconfirm alacritty
;;
*)
$ESCALATION_TOOL ${PACKAGER} install -y alacritty
$ESCALATION_TOOL "$PACKAGER" install -y alacritty
;;
esac
else
Expand Down
6 changes: 3 additions & 3 deletions tabs/applications-setup/fastfetch-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
setupFastfetch() {
echo "Installing Fastfetch if not already installed..."
if ! command_exists fastfetch; then
case ${PACKAGER} in
case "$PACKAGER" in
pacman)
$ESCALATION_TOOL "${PACKAGER}" -S --needed --noconfirm fastfetch
$ESCALATION_TOOL "$PACKAGER" -S --needed --noconfirm fastfetch
;;
*)
$ESCALATION_TOOL "${PACKAGER}" install -y fastfetch
$ESCALATION_TOOL "$PACKAGER" install -y fastfetch
;;
esac
else
Expand Down
6 changes: 3 additions & 3 deletions tabs/applications-setup/kitty-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
setupKitty() {
echo "Install Kitty if not already installed..."
if ! command_exists kitty; then
case ${PACKAGER} in
case "$PACKAGER" in
pacman)
$ESCALATION_TOOL "${PACKAGER}" -S --needed --noconfirm kitty
$ESCALATION_TOOL "$PACKAGER" -S --needed --noconfirm kitty
;;
*)
$ESCALATION_TOOL "${PACKAGER}" install -y kitty
$ESCALATION_TOOL "$PACKAGER" install -y kitty
;;
esac
else
Expand Down
2 changes: 1 addition & 1 deletion tabs/common-script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ checkPackageManager() {
fi
done

if [ -z "${PACKAGER}" ]; then
if [ -z "$PACKAGER" ]; then
printf "%b\n" "${RED}Can't find a supported package manager${RC}"
exit 1
fi
Expand Down
6 changes: 3 additions & 3 deletions tabs/security/firewall-baselines.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
installPkg() {
echo "Install UFW if not already installed..."
if ! command_exists ufw; then
case ${PACKAGER} in
case "$PACKAGER" in
pacman)
$ESCALATION_TOOL "${PACKAGER}" -S --needed --noconfirm ufw
$ESCALATION_TOOL "$PACKAGER" -S --needed --noconfirm ufw
;;
*)
$ESCALATION_TOOL "${PACKAGER}" install -y ufw
$ESCALATION_TOOL "$PACKAGER" install -y ufw
;;
esac
else
Expand Down
14 changes: 7 additions & 7 deletions tabs/system-setup/3-global-theme.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ install_theme_tools() {
printf "%b\n" "${YELLOW}Installing theme tools (qt6ct and kvantum)...${RC}\n"
case $PACKAGER in
apt-get)
$ESCALATION_TOOL apt-get update
$ESCALATION_TOOL apt-get install -y qt6ct kvantum
$ESCALATION_TOOL "$PACKAGER" update
$ESCALATION_TOOL "$PACKAGER" install -y qt6ct kvantum
;;
zypper)
$ESCALATION_TOOL zypper refresh
$ESCALATION_TOOL zypper --non-interactive install qt6ct kvantum
$ESCALATION_TOOL "$PACKAGER" refresh
$ESCALATION_TOOL "$PACKAGER" --non-interactive install qt6ct kvantum
;;
dnf)
$ESCALATION_TOOL dnf update
$ESCALATION_TOOL dnf install -y qt6ct kvantum
$ESCALATION_TOOL "$PACKAGER" update
$ESCALATION_TOOL "$PACKAGER" install -y qt6ct kvantum
;;
pacman)
$ESCALATION_TOOL pacman -S --needed --noconfirm qt6ct kvantum
$ESCALATION_TOOL "$PACKAGER" -S --needed --noconfirm qt6ct kvantum
;;
*)
printf "%b\n" "${RED}Unsupported package manager. Please install qt6ct and kvantum manually.${RC}\n"
Expand Down
8 changes: 4 additions & 4 deletions tabs/system-setup/4-remove-snaps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
removeSnaps() {
case $PACKAGER in
pacman)
$ESCALATION_TOOL ${PACKAGER} -Rns snapd
$ESCALATION_TOOL "$PACKAGER" -Rns snapd
;;
apt-get|nala)
$ESCALATION_TOOL ${PACKAGER} autoremove --purge snapd
$ESCALATION_TOOL "$PACKAGER" autoremove --purge snapd
if [ "$ID" = ubuntu ]; then
$ESCALATION_TOOL apt-mark hold snapd
fi
;;
dnf)
$ESCALATION_TOOL ${PACKAGER} remove snapd
$ESCALATION_TOOL "$PACKAGER" remove snapd
;;
zypper)
$ESCALATION_TOOL ${PACKAGER} remove snapd
$ESCALATION_TOOL "$PACKAGER" remove snapd
;;
*)
echo "Removing snapd not implemented for this package manager"
Expand Down
40 changes: 20 additions & 20 deletions tabs/system-setup/system-update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
. ../common-script.sh

fastUpdate() {
case ${PACKAGER} in
case "$PACKAGER" in
pacman)

$AUR_HELPER -S --needed --noconfirm rate-mirrors-bin
Expand Down Expand Up @@ -31,27 +31,27 @@ fastUpdate() {
$ESCALATION_TOOL apt-get install -y nala || { printf "%b\n" "${YELLOW}Falling back to apt-get${RC}"; PACKAGER="apt-get"; }
fi

if [ "${PACKAGER}" = "nala" ]; then
if [ "$PACKAGER" = "nala" ]; then
$ESCALATION_TOOL cp /etc/apt/sources.list /etc/apt/sources.list.bak
$ESCALATION_TOOL nala update
PACKAGER="nala"
fi

$ESCALATION_TOOL ${PACKAGER} upgrade -y
$ESCALATION_TOOL "$PACKAGER" upgrade -y
;;
dnf)
$ESCALATION_TOOL ${PACKAGER} update -y
$ESCALATION_TOOL "$PACKAGER" update -y
;;
zypper)
$ESCALATION_TOOL ${PACKAGER} ref
$ESCALATION_TOOL ${PACKAGER} --non-interactive dup
$ESCALATION_TOOL "$PACKAGER" ref
$ESCALATION_TOOL "$PACKAGER" --non-interactive dup
;;
yum)
$ESCALATION_TOOL ${PACKAGER} update -y
$ESCALATION_TOOL ${PACKAGER} upgrade -y
$ESCALATION_TOOL "$PACKAGER" update -y
$ESCALATION_TOOL "$PACKAGER" upgrade -y
;;
xbps-install)
$ESCALATION_TOOL ${PACKAGER} -Syu
$ESCALATION_TOOL "$PACKAGER" -Syu
;;
*)
printf "%b\n" "${RED}Unsupported package manager: $PACKAGER${RC}"
Expand All @@ -62,28 +62,28 @@ fastUpdate() {

updateSystem() {
printf "%b\n" "${GREEN}Updating system${RC}"
case ${PACKAGER} in
case "$PACKAGER" in
nala|apt-get)
$ESCALATION_TOOL "${PACKAGER}" update -y
$ESCALATION_TOOL "${PACKAGER}" upgrade -y
$ESCALATION_TOOL "$PACKAGER" update -y
$ESCALATION_TOOL "$PACKAGER" upgrade -y
;;
yum|dnf)
$ESCALATION_TOOL "${PACKAGER}" update -y
$ESCALATION_TOOL "${PACKAGER}" upgrade -y
$ESCALATION_TOOL "$PACKAGER" update -y
$ESCALATION_TOOL "$PACKAGER" upgrade -y
;;
pacman)
$ESCALATION_TOOL "${PACKAGER}" -Sy --noconfirm --needed archlinux-keyring
$ESCALATION_TOOL "${PACKAGER}" -Su --noconfirm
$ESCALATION_TOOL "$PACKAGER" -Sy --noconfirm --needed archlinux-keyring
$ESCALATION_TOOL "$PACKAGER" -Su --noconfirm
;;
zypper)
$ESCALATION_TOOL ${PACKAGER} ref
$ESCALATION_TOOL ${PACKAGER} --non-interactive dup
$ESCALATION_TOOL "$PACKAGER" ref
$ESCALATION_TOOL "$PACKAGER" --non-interactive dup
;;
xbps-install)
$ESCALATION_TOOL ${PACKAGER} -Syu
$ESCALATION_TOOL "$PACKAGER" -Syu
;;
*)
printf "%b\n" "${RED}Unsupported package manager: ${PACKAGER}${RC}"
printf "%b\n" "${RED}Unsupported package manager: "$PACKAGER"${RC}"
exit 1
;;
esac
Expand Down
8 changes: 4 additions & 4 deletions tabs/utils/monitor-control/utility_functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
setup_xrandr() {
echo "Install xrandr if not already installed..."
if ! command_exists xrandr; then
case ${PACKAGER} in
case "$PACKAGER" in
pacman)
$ESCALATION_TOOL "${PACKAGER}" -S --noconfirm xorg-xrandr
$ESCALATION_TOOL "$PACKAGER" -S --noconfirm xorg-xrandr
;;
apt-get)
$ESCALATION_TOOL "${PACKAGER}" install -y x11-xserver-utils
$ESCALATION_TOOL "$PACKAGER" install -y x11-xserver-utils
;;
*)
$ESCALATION_TOOL "${PACKAGER}" install -y xorg-x11-server-utils
$ESCALATION_TOOL "$PACKAGER" install -y xorg-x11-server-utils
;;
esac
else
Expand Down
6 changes: 3 additions & 3 deletions tabs/utils/wifi-control.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ setupNetworkManager() {
if ! command_exists nmcli; then
case ${PACKAGER} in
pacman)
$ESCALATION_TOOL "${PACKAGER}" -S --noconfirm networkmanager
$ESCALATION_TOOL "$PACKAGER" -S --noconfirm networkmanager
;;
dnf)
$ESCALATION_TOOL "${PACKAGER}" install -y NetworkManager-1
$ESCALATION_TOOL "$PACKAGER" install -y NetworkManager-1
;;
*)
$ESCALATION_TOOL "${PACKAGER}" install -y network-manager
$ESCALATION_TOOL "$PACKAGER" install -y network-manager
;;
esac
else
Expand Down