From e5ddd2ee4891de32b62604f8cbf2cc979d517bf5 Mon Sep 17 00:00:00 2001 From: Liam <33645555+lj3954@users.noreply.github.com> Date: Sun, 21 Jul 2024 13:19:03 -0700 Subject: [PATCH] refactor: Use common script to avoid code duplication --- src/commands/common-script.sh | 2 + src/commands/dotfiles/alacritty-setup.sh | 58 -------------------- src/commands/dotfiles/kitty-setup.sh | 58 -------------------- src/commands/dotfiles/rofi-setup.sh | 58 -------------------- src/commands/system-setup/1-compile-setup.sh | 58 -------------------- src/commands/system-setup/2-gaming-setup.sh | 55 ------------------- src/commands/system-update.sh | 57 ------------------- src/list.rs | 21 +++++-- 8 files changed, 17 insertions(+), 350 deletions(-) diff --git a/src/commands/common-script.sh b/src/commands/common-script.sh index a8d43871..30353cc0 100644 --- a/src/commands/common-script.sh +++ b/src/commands/common-script.sh @@ -1,5 +1,7 @@ #!/bin/sh -e +# shellcheck disable=SC2034 + RC='\033[0m' RED='\033[31m' YELLOW='\033[33m' diff --git a/src/commands/dotfiles/alacritty-setup.sh b/src/commands/dotfiles/alacritty-setup.sh index bf8473d5..4ef110f6 100755 --- a/src/commands/dotfiles/alacritty-setup.sh +++ b/src/commands/dotfiles/alacritty-setup.sh @@ -1,63 +1,5 @@ #!/bin/sh -e -RC='\033[0m' -RED='\033[31m' -YELLOW='\033[33m' -GREEN='\033[32m' - -command_exists() { - which $1 >/dev/null 2>&1 -} - -checkEnv() { - ## 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: ${REQUIREMENTS}${RC}" - exit 1 - fi - done - - ## Check Package Handler - PACKAGEMANAGER='apt-get dnf pacman zypper' - for pgm in ${PACKAGEMANAGER}; do - if command_exists ${pgm}; then - PACKAGER=${pgm} - echo "Using ${pgm}" - break - fi - done - - if [ -z "${PACKAGER}" ]; then - echo -e "${RED}Can't find a supported package manager${RC}" - exit 1 - fi - - ## Check SuperUser Group - SUPERUSERGROUP='wheel sudo root' - for sug in ${SUPERUSERGROUP}; do - if groups | grep -q ${sug}; then - SUGROUP=${sug} - echo "Super user group ${SUGROUP}" - break - fi - done - - ## 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 1 - fi - - DTYPE="unknown" # Default to unknown - # Use /etc/os-release for modern distro identification - if [ -f /etc/os-release ]; then - . /etc/os-release - DTYPE=$ID - fi -} - setupAlacritty() { echo "Install Alacritty if not already installed..." if ! command_exists alacritty; then diff --git a/src/commands/dotfiles/kitty-setup.sh b/src/commands/dotfiles/kitty-setup.sh index 52167460..60c9efb9 100755 --- a/src/commands/dotfiles/kitty-setup.sh +++ b/src/commands/dotfiles/kitty-setup.sh @@ -1,63 +1,5 @@ #!/bin/sh -e -RC='\033[0m' -RED='\033[31m' -YELLOW='\033[33m' -GREEN='\033[32m' - -command_exists() { - which $1 >/dev/null 2>&1 -} - -checkEnv() { - ## 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: ${REQUIREMENTS}${RC}" - exit 1 - fi - done - - ## Check Package Handler - PACKAGEMANAGER='apt-get dnf pacman zypper' - for pgm in ${PACKAGEMANAGER}; do - if command_exists ${pgm}; then - PACKAGER=${pgm} - echo "Using ${pgm}" - break - fi - done - - if [ -z "${PACKAGER}" ]; then - echo -e "${RED}Can't find a supported package manager${RC}" - exit 1 - fi - - ## Check SuperUser Group - SUPERUSERGROUP='wheel sudo root' - for sug in ${SUPERUSERGROUP}; do - if groups | grep -q ${sug}; then - SUGROUP=${sug} - echo "Super user group ${SUGROUP}" - break - fi - done - - ## 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 1 - fi - - DTYPE="unknown" # Default to unknown - # Use /etc/os-release for modern distro identification - if [ -f /etc/os-release ]; then - . /etc/os-release - DTYPE=$ID - fi -} - setupKitty() { echo "Install Kitty if not already installed..." if ! command_exists kitty; then diff --git a/src/commands/dotfiles/rofi-setup.sh b/src/commands/dotfiles/rofi-setup.sh index 16fc84c6..d3c6b728 100755 --- a/src/commands/dotfiles/rofi-setup.sh +++ b/src/commands/dotfiles/rofi-setup.sh @@ -1,63 +1,5 @@ #!/bin/sh -e -RC='\033[0m' -RED='\033[31m' -YELLOW='\033[33m' -GREEN='\033[32m' - -command_exists() { - which "$1" >/dev/null 2>&1 -} - -checkEnv() { - ## 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: ${REQUIREMENTS}${RC}" - exit 1 - fi - done - - ## Check Package Handler - PACKAGEMANAGER='apt-get dnf pacman zypper' - for pgm in $PACKAGEMANAGER; do - if command_exists "$pgm"; then - PACKAGER="$pgm" - echo "Using $pgm" - break - fi - done - - if [ -z "$PACKAGER" ]; then - echo -e "${RED}Can't find a supported package manager${RC}" - exit 1 - fi - - ## Check SuperUser Group - SUPERUSERGROUP='wheel sudo root' - for sug in $SUPERUSERGROUP; do - if groups | grep -q "$sug"; then - SUGROUP="$sug" - echo "Super user group $SUGROUP" - break - fi - done - - ## 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}\n" - exit 1 - fi - - DTYPE="unknown" # Default to unknown - # Use /etc/os-release for modern distro identification - if [ -f /etc/os-release ]; then - . /etc/os-release - DTYPE="$ID" - fi -} - setupRofi() { echo "Install Rofi if not already installed..." if ! command_exists rofi; then diff --git a/src/commands/system-setup/1-compile-setup.sh b/src/commands/system-setup/1-compile-setup.sh index 0c0df4f7..98b69b44 100755 --- a/src/commands/system-setup/1-compile-setup.sh +++ b/src/commands/system-setup/1-compile-setup.sh @@ -1,10 +1,5 @@ #!/bin/sh -e -RC='\033[0m' -RED='\033[31m' -YELLOW='\033[33m' -GREEN='\033[32m' - # Check if the home directory and linuxtoolbox folder exist, create them if they don't LINUXTOOLBOXDIR="$HOME/linuxtoolbox" @@ -27,59 +22,6 @@ fi cd "$LINUXTOOLBOXDIR/linux-setup" || exit -command_exists() { - command -v "$1" >/dev/null 2>&1 -} - -checkEnv() { - ## 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: $REQUIREMENTS${RC}" - exit 1 - fi - done - - ## Check Package Manager - PACKAGEMANAGER='apt yum dnf pacman zypper' - for pgm in $PACKAGEMANAGER; do - if command_exists "$pgm"; then - PACKAGER="$pgm" - echo "Using $pgm" - break - fi - done - - if [ -z "$PACKAGER" ]; then - echo -e "${RED}Can't find a supported package manager${RC}" - 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 1 - fi - - ## Check SuperUser Group - SUPERUSERGROUP='wheel sudo root' - for sug in $SUPERUSERGROUP; do - if groups | grep -q "$sug"; then - SUGROUP="$sug" - echo "Super user group $SUGROUP" - break - fi - done - - ## 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 1 - fi -} - installDepend() { ## Check for dependencies. DEPENDENCIES='tar tree multitail tldr trash-cli unzip cmake make jq' diff --git a/src/commands/system-setup/2-gaming-setup.sh b/src/commands/system-setup/2-gaming-setup.sh index c9ed0368..d61e5ecb 100755 --- a/src/commands/system-setup/2-gaming-setup.sh +++ b/src/commands/system-setup/2-gaming-setup.sh @@ -1,60 +1,5 @@ #!/bin/sh -e -RC='\e[0m' -RED='\e[31m' -YELLOW='\e[33m' -GREEN='\e[32m' - -command_exists() { - command -v $1 >/dev/null 2>&1 -} - -checkEnv() { - ## Check for requirements. - REQUIREMENTS='curl groups sudo' - if ! command_exists ${REQUIREMENTS}; then - echo -e "${RED}To run me, you need: ${REQUIREMENTS}${RC}" - exit 1 - fi - - ## Check Package Handeler - PACKAGEMANAGER='apt-get yum dnf pacman zypper' - for pgm in ${PACKAGEMANAGER}; do - if command_exists ${pgm}; then - PACKAGER=${pgm} - echo "Using ${pgm}" - fi - done - - if [ -z "${PACKAGER}" ]; then - echo -e "${RED}Can't find a supported package manager" - exit 1 - fi - - ## Check if the current directory is writable. - GITPATH="$(dirname "$(readlink -f "$0")")" - if [ ! -w ${GITPATH} ]; then - echo -e "${RED}Can't write to ${GITPATH}${RC}" - exit 1 - fi - - ## Check SuperUser Group - SUPERUSERGROUP='wheel sudo root' - for sug in ${SUPERUSERGROUP}; do - if groups | grep ${sug}; then - SUGROUP=${sug} - echo "Super user group ${SUGROUP}" - fi - done - - ## Check if member of the sudo group. - if ! groups | grep ${SUGROUP} >/dev/null; then - echo -e "${RED}You need to be a member of the sudo group to run me!" - exit 1 - fi - -} - installDepend() { ## Check for dependencies. echo -e "${YELLOW}Installing dependencies...${RC}" diff --git a/src/commands/system-update.sh b/src/commands/system-update.sh index 6faaf62a..577e5d0f 100755 --- a/src/commands/system-update.sh +++ b/src/commands/system-update.sh @@ -1,62 +1,5 @@ #!/bin/sh -e -RC='\033[0m' -RED='\033[31m' -YELLOW='\033[33m' -GREEN='\033[32m' - -command_exists() { - which $1 >/dev/null 2>&1 -} - -checkEnv() { - ## 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: ${REQUIREMENTS}${RC}" - exit 1 - fi - done - ## Check Package Handler - PACKAGEMANAGER='apt-get nala dnf pacman zypper yum xbps-install' - for pgm in ${PACKAGEMANAGER}; do - if command_exists ${pgm}; then - PACKAGER=${pgm} - echo "Using ${pgm}" - break - fi - done - - if [ -z "${PACKAGER}" ]; then - echo -e "${RED}Can't find a supported package manager${RC}" - exit 1 - fi - - ## Check SuperUser Group - SUPERUSERGROUP='wheel sudo root' - for sug in ${SUPERUSERGROUP}; do - if groups | grep ${sug} >/dev/null; then - SUGROUP=${sug} - echo "Super user group ${SUGROUP}" - break - fi - done - - ## Check if member of the sudo group. - if ! groups | grep ${SUGROUP} >/dev/null; then - echo -e "${RED}You need to be a member of the sudo group to run me!${RC}" - exit 1 - fi - - DTYPE="unknown" # Default to unknown - # Use /etc/os-release for modern distro identification - if [ -f /etc/os-release ]; then - . /etc/os-release - DTYPE=$ID - fi -} - fastUpdate() { case ${PACKAGER} in pacman) diff --git a/src/list.rs b/src/list.rs index 97aa36c6..15287d07 100644 --- a/src/list.rs +++ b/src/list.rs @@ -11,6 +11,15 @@ use ratatui::{ Frame, }; +macro_rules! with_common_script { + ($command:expr) => { + concat!( + include_str!("commands/common-script.sh"), + include_str!($command) + ) + }; +} + struct ListNode { name: &'static str, command: &'static str, @@ -57,7 +66,7 @@ impl CustomList { } => { ListNode { name: "Full System Update", - command: include_str!("commands/system-update.sh"), + command: with_common_script!("commands/system-update.sh"), }, ListNode { name: "Setup Bash Prompt", @@ -77,11 +86,11 @@ impl CustomList { } => { ListNode { name: "Build Prerequisites", - command: include_str!("commands/system-setup/1-compile-setup.sh"), + command: with_common_script!("commands/system-setup/1-compile-setup.sh"), }, ListNode { name: "Gaming Dependencies", - command: include_str!("commands/system-setup/2-gaming-setup.sh"), + command: with_common_script!("commands/system-setup/2-gaming-setup.sh"), }, ListNode { name: "Recursion?", @@ -94,15 +103,15 @@ impl CustomList { } => { ListNode { name: "Alacritty Setup", - command: include_str!("commands/dotfiles/alacritty-setup.sh"), + command: with_common_script!("commands/dotfiles/alacritty-setup.sh"), }, ListNode { name: "Kitty Setup", - command: include_str!("commands/dotfiles/kitty-setup.sh"), + command: with_common_script!("commands/dotfiles/kitty-setup.sh"), }, ListNode { name: "Rofi Setup", - command: include_str!("commands/dotfiles/rofi-setup.sh"), + command: with_common_script!("commands/dotfiles/rofi-setup.sh"), }, } });