From 0f3a8a8e9b4100c31451093d1ccdb98bdc3024c7 Mon Sep 17 00:00:00 2001 From: bckelley Date: Fri, 24 May 2024 12:11:13 -0500 Subject: [PATCH] Revert "Merge remote-tracking branch 'refs/remotes/origin/main'" This reverts commit 4d43d6d26a9112f72554555521b7290d1ff81c2e, reversing changes made to 550cbbce97ca5c8f44a3087fc216ad86af6158ad. --- README | 45 ------------------------------------ setup.sh | 70 ++++++++++++++++++-------------------------------------- 2 files changed, 22 insertions(+), 93 deletions(-) delete mode 100644 README diff --git a/README b/README deleted file mode 100644 index 2451c2d..0000000 --- a/README +++ /dev/null @@ -1,45 +0,0 @@ -## Overview of my `.bashrc` Configuration - -The `.bashrc` file is a script that runs every time a new terminal session is started in Unix-like operating systems. It is used to configure the shell session, set up aliases, define functions, and more, making the terminal easier to use and more powerful. Below is a summary of the key sections and functionalities defined in the provided `.bashrc` file. - -### Initial Setup and System Checks - -- **Environment Checks**: The script checks if it is running in an interactive mode and sets up the environment accordingly. -- **System Utilities**: It checks for the presence of utilities like `fastfetch`, `bash-completion`, and system-specific configurations (`/etc/bashrc`). - -### Aliases and Functions - -- **Aliases**: Shortcuts for common commands are set up to enhance productivity. For example, `alias cp='cp -i'` makes the `cp` command interactive, asking for confirmation before overwriting files. -- **Functions**: Custom functions for complex operations like `extract()` for extracting various archive types, and `cpp()` for copying files with a progress bar. - -### Prompt Customization and History Management - -- **Prompt Command**: The `PROMPT_COMMAND` variable is set to automatically save the command history after each command. -- **History Control**: Settings to manage the size of the history file and how duplicates are handled. - -### System-Specific Aliases and Settings - -- **Editor Settings**: Sets `nvim` (NeoVim) as the default editor. -- **Conditional Aliases**: Depending on the system type (like Fedora), it sets specific aliases, e.g., replacing `cat` with `bat`. - -### Enhancements and Utilities - -- **Color and Formatting**: Enhancements for command output readability using colors and formatting for tools like `ls`, `grep`, and `man`. -- **Navigation Shortcuts**: Aliases to simplify directory navigation, e.g., `alias ..='cd ..'` to go up one directory. -- **Safety Features**: Aliases for safer file operations, like using `trash` instead of `rm` for deleting files, to prevent accidental data loss. -- **Extensive Zoxide support**: Easily navigate with `z`, `zi`, or pressing Ctrl+f to launch zi to see frequently used navigation directories. - -### Advanced Functions - -- **System Information**: Functions to display system information like `distribution()` to identify the Linux distribution. -- **Networking Utilities**: Tools to check internal and external IP addresses. -- **Resource Monitoring**: Commands to monitor system resources like disk usage and open ports. - -### Installation and Configuration Helpers - -- **Auto-Install**: A function `install_bashrc_support()` to automatically install necessary utilities based on the system type. -- **Configuration Editors**: Functions to edit important configuration files directly, e.g., `apacheconfig()` for Apache server configurations. - -### Conclusion - -This `.bashrc` file is a comprehensive setup that not only enhances the shell experience with useful aliases and functions but also provides system-specific configurations and safety features to cater to different user needs and system types. It is designed to make the terminal more user-friendly, efficient, and powerful for an average user. diff --git a/setup.sh b/setup.sh index f759310..4c0f183 100755 --- a/setup.sh +++ b/setup.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh RC='\e[0m' RED='\e[31m' @@ -9,19 +9,27 @@ command_exists() { command -v "$1" >/dev/null 2>&1 } +## Function to grant sudo permissions to the current user +grant_sudo_permissions() { + # Prompt for the root password + su -c "usermod -aG sudo ${USER}" + echo "Sudo permissions granted to user ${USER}" +} + +# Check if the user is in the sudo group +if id -nG "${USER}" | grep -qw "sudo"; then + echo "User ${USER} is already in the sudo group" +else + grant_sudo_permissions +fi + checkEnv() { - - if [ "$(id -u)" != "0" ]; then - echo -e "${RED}This script must be run as root.${RC}" 1>&2 - exit 0 - fi - ## Check for requirements. REQUIREMENTS='curl groups sudo' for req in ${REQUIREMENTS}; do if ! command_exists "$req"; then echo -e "${RED}To run me, you need: ${req}${RC}" - exit 0 + exit 1 fi done @@ -37,14 +45,14 @@ checkEnv() { if [ -z "${PACKAGER}" ]; then echo -e "${RED}Can't find a supported package manager${RC}" - exit 0 + exit 1 fi ## Check if the current directory is writable. GITPATH="$(dirname "$(realpath "$0")")" if [ ! -w "${GITPATH}" ]; then echo -e "${RED}Can't write to ${GITPATH}${RC}" - exit 0 + exit 1 fi ## Check SuperUser Group @@ -60,7 +68,7 @@ checkEnv() { ## Check if member of the sudo group. if ! groups | grep -q "$SUGROUP"; then echo -e "${RED}You need to be a member of the sudo group to run me!${RC}" - exit 0 + exit 1 fi } @@ -68,7 +76,6 @@ installDepend() { ## Check for dependencies. DEPENDENCIES='bash bash-completion tar neovim bat tree multitail fastfetch' echo -e "${YELLOW}Installing dependencies...${RC}" -<<<<<<< HEAD if [ "$PACKAGER" = "pacman" ]; then if ! command_exists yay && ! command_exists paru; then echo "Installing yay as AUR helper..." @@ -92,28 +99,6 @@ installDepend() { else sudo "$PACKAGER" install -yq ${DEPENDENCIES} fi -======= - for pkg in $DEPENDENCIES; do - read -p "Would you like to install $pkg package? [Y/n]: " choice - case "$choice" in - y|Y|'') - if [ "$PACKAGER" = "pacman" ]; then - sudo "$PACKAGER" -S --noconfirm "$pkg" - else - sudo "$PACKAGER" install -y "$pkg" - fi - ;; - n|N) ;; - *) echo "Invalid choice. Defaulting to yes." - if [ "$PACKAGER" = "pacman" ]; then - sudo "$PACKAGER" -S --noconfirm "$pkg" - else - sudo "$PACKAGER" install -y "$pkg" - fi - ;; - esac - done ->>>>>>> refs/remotes/origin/main } installOhMyPosh() { @@ -124,7 +109,7 @@ installOhMyPosh() { if ! curl -sS https://ohmyposh.dev/install.sh | bash -s; then echo -e "${RED}Something went wrong during oh-my-posh install!${RC}" - exit 0 + exit 1 fi oh-my-posh font install @@ -145,7 +130,7 @@ installZoxide() { if ! curl -sS https://raw.githubusercontent.com/ajeetdsouza/zoxide/main/install.sh | sh; then echo -e "${RED}Something went wrong during zoxide install!${RC}" - exit 0 + exit 1 fi } @@ -155,20 +140,9 @@ installFastfetch() { return fi -<<<<<<< HEAD if ! curl -sSL https://github.com/fastfetch-cli/fastfetch/releases/download/2.13.2/fastfetch-linux-amd64.deb -o fastfetch-linux-amd64.deb || ! sudo dpkg -i fastfetch-linux-amd64.deb; then echo -e "${RED}Something went wrong during fastfetch install${RC}" exit 1 -======= - echo -e "${YELLOW}Installing fastfetch...${RC}" - if [ "$PACKAGER" = "nala" ] || [ "$PACKAGER" = "apt" ]; then - if ! curl -sSL https://github.com/fastfetch-cli/fastfetch/releases/download/2.13.2/fastfetch-linux-amd64.deb -o fastfetch-linux-amd64.deb || ! sudo dpkg -i fastfetch-linux-amd64.deb; then - echo -e "${RED}Something went wrong during fastfetch install${RC}" - exit 0 - fi - else - sudo "$PACKAGER" install -y fastfetch ->>>>>>> refs/remotes/origin/main fi } @@ -190,7 +164,7 @@ linkConfig() { echo -e "${YELLOW}Moving old bash config file to ${USER_HOME}/.bashrc.bak${RC}" if ! mv "${OLD_BASHRC}" "${USER_HOME}/.bashrc.bak"; then echo -e "${RED}Can't move the old bash config file!${RC}" - exit 0 + exit 1 fi fi