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

Change apt-get's & use nala along with apt #440

Closed
wants to merge 2 commits into from
Closed

Change apt-get's & use nala along with apt #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0717ca6
Change apt-get's & use nala along with apt
nnyyxxxx Sep 17, 2024
acfcea7
Move packager variables to different PR
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/dwmtitus-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ setupDWM() {
pacman)
$ESCALATION_TOOL "$PACKAGER" -S --needed --noconfirm base-devel libx11 libxinerama libxft imlib2 libxcb
;;
apt-get|nala)
apt|nala)
$ESCALATION_TOOL "$PACKAGER" install -y build-essential libx11-dev libxinerama-dev libxft-dev libimlib2-dev libx11-xcb-dev libfontconfig1 libx11-6 libxft2 libxinerama1 libxcb-res0-dev
;;
dnf)
Expand Down Expand Up @@ -178,7 +178,7 @@ setupDisplayManager() {
pacman)
$ESCALATION_TOOL "$PACKAGER" -S --needed --noconfirm xorg-xinit xorg-server
;;
apt-get|nala)
apt|nala)
$ESCALATION_TOOL "$PACKAGER" install -y xorg xinit
;;
dnf)
Expand Down Expand Up @@ -206,7 +206,7 @@ setupDisplayManager() {
pacman)
$ESCALATION_TOOL "$PACKAGER" -S --needed --noconfirm "$DM"
;;
apt-get|nala)
apt|nala)
$ESCALATION_TOOL "$PACKAGER" install -y "$DM"
;;
dnf)
Expand Down
2 changes: 1 addition & 1 deletion tabs/applications-setup/mybash-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ installDepend() {
pacman)
$ESCALATION_TOOL "$PACKAGER" -S --needed --noconfirm bash bash-completion tar bat tree unzip fontconfig
;;
apt)
apt|nala)
$ESCALATION_TOOL "$PACKAGER" install -y bash bash-completion tar bat tree unzip fontconfig
;;
dnf)
Expand Down
2 changes: 1 addition & 1 deletion tabs/applications-setup/neovim-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ setupNeovim() {
pacman)
$ESCALATION_TOOL "$PACKAGER" -S --needed --noconfirm neovim ripgrep fzf python-virtualenv luarocks go shellcheck
;;
apt)
apt|nala)
$ESCALATION_TOOL "$PACKAGER" install -y neovim ripgrep fd-find python3-venv luarocks golang-go shellcheck
;;
dnf)
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 @@ -125,7 +125,7 @@ checkDistro() {

checkEnv() {
checkCommandRequirements 'curl groups sudo'
checkPackageManager 'apt-get nala dnf pacman zypper yum xbps-install nix-env'
checkPackageManager 'apt nala dnf pacman zypper yum xbps-install nix-env'
checkCurrentDirectoryWritable
checkSuperUser
checkDistro
Expand Down
2 changes: 1 addition & 1 deletion tabs/system-setup/1-compile-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ installDepend() {
fi
$AUR_HELPER -S --needed --noconfirm "$DEPENDENCIES"
;;
apt-get|nala)
apt|nala)
COMPILEDEPS='build-essential'
$ESCALATION_TOOL "$PACKAGER" update
$ESCALATION_TOOL dpkg --add-architecture i386
Expand Down
6 changes: 3 additions & 3 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,9 +5,9 @@
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|nala)
$ESCALATION_TOOL apt update
$ESCALATION_TOOL apt install -y qt6ct kvantum
;;
zypper)
$ESCALATION_TOOL zypper refresh
Expand Down
2 changes: 1 addition & 1 deletion tabs/system-setup/4-remove-snaps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ removeSnaps() {
pacman)
$ESCALATION_TOOL ${PACKAGER} -Rns snapd
;;
apt-get|nala)
apt|nala)
$ESCALATION_TOOL ${PACKAGER} autoremove --purge snapd
if [ "$ID" = ubuntu ]; then
$ESCALATION_TOOL apt-mark hold snapd
Expand Down
8 changes: 4 additions & 4 deletions tabs/system-setup/system-update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ fastUpdate() {
fi
;;

apt-get|nala)
$ESCALATION_TOOL apt-get update
apt|nala)
$ESCALATION_TOOL apt update
if ! command_exists nala; then
$ESCALATION_TOOL apt-get install -y nala || { printf "%b\n" "${YELLOW}Falling back to apt-get${RC}"; PACKAGER="apt-get"; }
$ESCALATION_TOOL apt install -y nala || { printf "%b\n" "${YELLOW}Falling back to apt${RC}"; PACKAGER="apt"; }
fi

if [ "${PACKAGER}" = "nala" ]; then
Expand Down Expand Up @@ -63,7 +63,7 @@ fastUpdate() {
updateSystem() {
printf "%b\n" "${GREEN}Updating system${RC}"
case ${PACKAGER} in
nala|apt-get)
apt|nala)
$ESCALATION_TOOL "${PACKAGER}" update -y
$ESCALATION_TOOL "${PACKAGER}" upgrade -y
;;
Expand Down