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

refactor: apt-get with nala and hardcoded package managers #422

Merged
merged 5 commits into from
Sep 18, 2024
Merged

refactor: apt-get with nala and hardcoded package managers #422

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
61cddeb
Swap nala apt-get
jeevithakannan2 Sep 16, 2024
6237d1e
Merge branch 'ChrisTitusTech:main' into nala
jeevithakannan2 Sep 17, 2024
8df764a
Refactor remaining variables
jeevithakannan2 Sep 17, 2024
16fbd33
Added missed packager
jeevithakannan2 Sep 17, 2024
e3b2530
Merge branch 'main' into nala
ChrisTitusTech Sep 18, 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
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 @@ -125,7 +125,7 @@ checkDistro() {

checkEnv() {
checkCommandRequirements 'curl groups sudo'
checkPackageManager 'apt-get nala dnf pacman zypper yum xbps-install nix-env'
checkPackageManager 'nala apt-get dnf pacman zypper yum xbps-install nix-env'
checkCurrentDirectoryWritable
checkSuperUser
checkDistro
Expand Down
16 changes: 8 additions & 8 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 @@ -5,20 +5,20 @@
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
apt-get|nala)
$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
5 changes: 3 additions & 2 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 @@ -10,7 +10,7 @@ setup_xrandr() {
pacman)
$ESCALATION_TOOL "${PACKAGER}" -S --noconfirm xorg-xrandr
;;
apt-get)
apt-get|nala)
$ESCALATION_TOOL "${PACKAGER}" install -y x11-xserver-utils
;;
*)
Expand Down Expand Up @@ -83,4 +83,5 @@ confirm_action() {
}

checkEnv
setup_xrandr
checkEscalationTool
setup_xrandr
Loading