mitsuo_makuda/linutil
1
0
Fork 0
mirror of https://github.com/ChrisTitusTech/linutil.git synced 2024-11-22 05:12:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #60 from lj3954/use_common_script

Browse Source 
refactor: Use common script to avoid code duplication
This commit is contained in:
Chris Titus 2024-07-23 15:44:21 -05:00 committed by GitHub
commit df563ad6a1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 97 additions and 365 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/commands/common-script.sh
View File

@ -1,28 +1,33 @@
#!/bin/sh -e #!/bin/sh -e
# shellcheck disable=SC2034
RC='\033[0m' RC='\033[0m'
RED='\033[31m' RED='\033[31m'
YELLOW='\033[33m' YELLOW='\033[33m'
GREEN='\033[32m' GREEN='\033[32m'
command_exists() { command_exists() {
which $1 >/dev/null 2>&1 which "$1" >/dev/null 2>&1
} }
checkEnv() {
checkCommandRequirements() {
## Check for requirements. ## Check for requirements.
REQUIREMENTS='curl groups sudo' REQUIREMENTS=$1
for req in ${REQUIREMENTS}; do for req in ${REQUIREMENTS}; do
if ! command_exists ${req}; then if ! command_exists "${req}"; then
echo -e "${RED}To run me, you need: ${REQUIREMENTS}${RC}" echo "${RED}To run me, you need: ${REQUIREMENTS}${RC}"
exit 1 exit 1
fi fi
done done
}
## Check Package Handler checkPackageManager() {
PACKAGEMANAGER='apt-get dnf pacman zypper' ## Check Package Manager
PACKAGEMANAGER=$1
for pgm in ${PACKAGEMANAGER}; do for pgm in ${PACKAGEMANAGER}; do
if command_exists ${pgm}; then if command_exists "${pgm}"; then
PACKAGER=${pgm} PACKAGER=${pgm}
echo "Using ${pgm}" echo "Using ${pgm}"
break break
@ -33,11 +38,13 @@ checkEnv() {
echo -e "${RED}Can't find a supported package manager${RC}" echo -e "${RED}Can't find a supported package manager${RC}"
exit 1 exit 1
fi fi
}
checkSuperUser() {
## Check SuperUser Group ## Check SuperUser Group
SUPERUSERGROUP='wheel sudo root' SUPERUSERGROUP='wheel sudo root'
for sug in ${SUPERUSERGROUP}; do for sug in ${SUPERUSERGROUP}; do
if groups | grep -q ${sug}; then if groups | grep -q "${sug}"; then
SUGROUP=${sug} SUGROUP=${sug}
echo "Super user group ${SUGROUP}" echo "Super user group ${SUGROUP}"
break break
@ -45,15 +52,33 @@ checkEnv() {
done done
## Check if member of the sudo group. ## Check if member of the sudo group.
if ! groups | grep -q ${SUGROUP}; then if ! groups | grep -q "${SUGROUP}"; then
echo -e "${RED}You need to be a member of the sudo group to run me!${RC}" echo "${RED}You need to be a member of the sudo group to run me!${RC}"
exit 1 exit 1
fi fi
}
checkCurrentDirectoryWritable() {
## Check if the current directory is writable.
GITPATH="$(dirname "$(realpath "$0")")"
if [ ! -w "$GITPATH" ]; then
echo "${RED}Can't write to $GITPATH${RC}"
exit 1
fi
}
checkDistro() {
DTYPE="unknown" # Default to unknown DTYPE="unknown" # Default to unknown
# Use /etc/os-release for modern distro identification # Use /etc/os-release for modern distro identification
if [ -f /etc/os-release ]; then if [ -f /etc/os-release ]; then
. /etc/os-release . /etc/os-release
DTYPE=$ID DTYPE=$ID
fi fi
} }
checkEnv() {
checkCommandRequirements 'curl groups sudo'
checkPackageHandler 'apt-get dnf pacman zypper'
checkSuperUser
checkDistro
}

61
src/commands/dotfiles/alacritty-setup.sh
View File

@ -1,61 +1,10 @@
#!/bin/sh -e #!/bin/sh -e
RC='\033[0m'
RED='\033[31m'
YELLOW='\033[33m'
GREEN='\033[32m'
command_exists() {
which $1 >/dev/null 2>&1
}
checkEnv() { checkEnv() {
## Check for requirements. checkCommandRequirements 'curl groups sudo'
REQUIREMENTS='curl groups sudo' checkPackageManager 'apt-get dnf pacman zypper'
for req in ${REQUIREMENTS}; do checkSuperUser
if ! command_exists ${req}; then checkDistro
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() { setupAlacritty() {
@ -82,4 +31,4 @@ setupAlacritty() {
} }
checkEnv checkEnv
setupAlacritty setupAlacritty

73
src/commands/dotfiles/kitty-setup.sh
View File

@ -1,61 +1,10 @@
#!/bin/sh -e #!/bin/sh -e
RC='\033[0m'
RED='\033[31m'
YELLOW='\033[33m'
GREEN='\033[32m'
command_exists() {
which $1 >/dev/null 2>&1
}
checkEnv() { checkEnv() {
## Check for requirements. checkCommandRequirements 'curl groups sudo'
REQUIREMENTS='curl groups sudo' checkPackageManager 'apt-get dnf pacman zypper'
for req in ${REQUIREMENTS}; do checkSuperUser
if ! command_exists ${req}; then checkDistro
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() { setupKitty() {
@ -63,10 +12,10 @@ setupKitty() {
if ! command_exists kitty; then if ! command_exists kitty; then
case ${PACKAGER} in case ${PACKAGER} in
pacman) pacman)
sudo ${PACKAGER} -S --noconfirm kitty sudo "${PACKAGER}" -S --noconfirm kitty
;; ;;
*) *)
sudo ${PACKAGER} install -y kitty sudo "${PACKAGER}" install -y kitty
;; ;;
esac esac
else else
@ -74,12 +23,12 @@ setupKitty() {
fi fi
echo "Copy Kitty config files" echo "Copy Kitty config files"
if [ -d "${HOME}/.config/kitty" ]; then if [ -d "${HOME}/.config/kitty" ]; then
cp -r ${HOME}/.config/kitty ${HOME}/.config/kitty-bak cp -r "${HOME}"/.config/kitty "${HOME}"/.config/kitty-bak
fi fi
mkdir -p ${HOME}/.config/kitty/ mkdir -p "${HOME}"/.config/kitty/
wget -O ${HOME}/.config/kitty/kitty.conf https://github.com/ChrisTitusTech/dwm-titus/raw/main/config/kitty/kitty.conf wget -O "${HOME}"/.config/kitty/kitty.conf https://github.com/ChrisTitusTech/dwm-titus/raw/main/config/kitty/kitty.conf
wget -O ${HOME}/.config/kitty/nord.conf https://github.com/ChrisTitusTech/dwm-titus/raw/main/config/kitty/nord.conf wget -O "${HOME}"/.config/kitty/nord.conf https://github.com/ChrisTitusTech/dwm-titus/raw/main/config/kitty/nord.conf
} }
checkEnv checkEnv
setupKitty setupKitty

61
src/commands/dotfiles/rofi-setup.sh
View File

@ -1,61 +1,10 @@
#!/bin/sh -e #!/bin/sh -e
RC='\033[0m'
RED='\033[31m'
YELLOW='\033[33m'
GREEN='\033[32m'
command_exists() {
which "$1" >/dev/null 2>&1
}
checkEnv() { checkEnv() {
## Check for requirements. checkCommandRequirements 'curl groups sudo'
REQUIREMENTS='curl groups sudo' checkPackageManager 'apt-get dnf pacman zypper'
for req in $REQUIREMENTS; do checkSuperUser
if ! command_exists "$req"; then checkDistro
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() { setupRofi() {
@ -87,4 +36,4 @@ setupRofi() {
} }
checkEnv checkEnv
setupRofi setupRofi

71
src/commands/system-setup/1-compile-setup.sh
View File

@ -1,10 +1,5 @@
#!/bin/sh -e #!/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 # Check if the home directory and linuxtoolbox folder exist, create them if they don't
LINUXTOOLBOXDIR="$HOME/linuxtoolbox" LINUXTOOLBOXDIR="$HOME/linuxtoolbox"
@ -27,57 +22,11 @@ fi
cd "$LINUXTOOLBOXDIR/linux-setup" || exit cd "$LINUXTOOLBOXDIR/linux-setup" || exit
command_exists() {
command -v "$1" >/dev/null 2>&1
}
checkEnv() { checkEnv() {
## Check for requirements. checkCommandRequirements 'curl groups sudo'
REQUIREMENTS='curl groups sudo' checkPackageHandler 'apt yum dnf pacman zypper'
for req in $REQUIREMENTS; do checkCurrentDirectoryWritable
if ! command_exists "$req"; then checkSuperUser
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() { installDepend() {
@ -109,30 +58,30 @@ installDepend() {
echo "No AUR helper found. Please install yay or paru." echo "No AUR helper found. Please install yay or paru."
exit 1 exit 1
fi fi
"$AUR_HELPER" --noconfirm -S $DEPENDENCIES "$AUR_HELPER" --noconfirm -S "$DEPENDENCIES"
;; ;;
apt) apt)
COMPILEDEPS='build-essential' COMPILEDEPS='build-essential'
sudo "$PACKAGER" update sudo "$PACKAGER" update
sudo dpkg --add-architecture i386 sudo dpkg --add-architecture i386
sudo "$PACKAGER" update sudo "$PACKAGER" update
sudo "$PACKAGER" install -y $DEPENDENCIES $COMPILEDEPS sudo "$PACKAGER" install -y "$DEPENDENCIES" $COMPILEDEPS
;; ;;
dnf) dnf)
COMPILEDEPS='@development-tools' COMPILEDEPS='@development-tools'
sudo "$PACKAGER" update sudo "$PACKAGER" update
sudo "$PACKAGER" config-manager --set-enabled powertools sudo "$PACKAGER" config-manager --set-enabled powertools
sudo "$PACKAGER" install -y $DEPENDENCIES $COMPILEDEPS sudo "$PACKAGER" install -y "$DEPENDENCIES" $COMPILEDEPS
sudo "$PACKAGER" install -y glibc-devel.i686 libgcc.i686 sudo "$PACKAGER" install -y glibc-devel.i686 libgcc.i686
;; ;;
zypper) zypper)
COMPILEDEPS='patterns-devel-base-devel_basis' COMPILEDEPS='patterns-devel-base-devel_basis'
sudo "$PACKAGER" refresh sudo "$PACKAGER" refresh
sudo "$PACKAGER" --non-interactive install $DEPENDENCIES $COMPILEDEPS sudo "$PACKAGER" --non-interactive install "$DEPENDENCIES" $COMPILEDEPS
sudo "$PACKAGER" --non-interactive install libgcc_s1-gcc7-32bit glibc-devel-32bit sudo "$PACKAGER" --non-interactive install libgcc_s1-gcc7-32bit glibc-devel-32bit
;; ;;
*) *)
sudo "$PACKAGER" install -y $DEPENDENCIES sudo "$PACKAGER" install -y "$DEPENDENCIES"
;; ;;
esac esac
} }
@ -159,4 +108,4 @@ install_additional_dependencies() {
checkEnv checkEnv
installDepend installDepend
install_additional_dependencies install_additional_dependencies

58
src/commands/system-setup/2-gaming-setup.sh
View File

@ -1,58 +1,10 @@
#!/bin/sh -e #!/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() { checkEnv() {
## Check for requirements. checkCommandRequirements 'curl groups sudo'
REQUIREMENTS='curl groups sudo' checkPackageManager 'apt-get yum dnf pacman zypper'
if ! command_exists ${REQUIREMENTS}; then checkCurrentDirectoryWritable
echo -e "${RED}To run me, you need: ${REQUIREMENTS}${RC}" checkSuperUser
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() { installDepend() {
@ -138,4 +90,4 @@ install_additional_dependencies() {
checkEnv checkEnv
installDepend installDepend
install_additional_dependencies install_additional_dependencies

68
src/commands/system-update.sh
View File

@ -1,60 +1,10 @@
#!/bin/sh -e #!/bin/sh -e
RC='\033[0m'
RED='\033[31m'
YELLOW='\033[33m'
GREEN='\033[32m'
command_exists() {
which $1 >/dev/null 2>&1
}
checkEnv() { checkEnv() {
## Check for requirements. checkCommandRequirements 'curl groups sudo'
REQUIREMENTS='curl groups sudo' checkPackageManager 'apt-get nala dnf pacman zypper yum xbps-install'
for req in ${REQUIREMENTS}; do checkSuperUser
if ! command_exists ${req}; then checkDistro
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() { fastUpdate() {
@ -125,15 +75,15 @@ updateSystem() {
echo -e "${GREEN}Updating system${RC}" echo -e "${GREEN}Updating system${RC}"
case ${PACKAGER} in case ${PACKAGER} in
nala|apt-get) nala|apt-get)
sudo ${PACKAGER} update -y sudo "${PACKAGER}" update -y
sudo ${PACKAGER} upgrade -y sudo "${PACKAGER}" upgrade -y
;; ;;
yum|dnf) yum|dnf)
sudo ${PACKAGER} update -y sudo "${PACKAGER}" update -y
sudo ${PACKAGER} upgrade -y sudo "${PACKAGER}" upgrade -y
;; ;;
pacman) pacman)
sudo ${PACKAGER} -Syu --noconfirm sudo "${PACKAGER}" -Syu --noconfirm
;; ;;
zypper) zypper)
sudo ${PACKAGER} ref sudo ${PACKAGER} ref

21
src/list.rs
View File

@ -11,6 +11,15 @@ use ratatui::{
Frame, Frame,
}; };
macro_rules! with_common_script {
($command:expr) => {
concat!(
include_str!("commands/common-script.sh"),
include_str!($command)
)
};
}
struct ListNode { struct ListNode {
name: &'static str, name: &'static str,
command: &'static str, command: &'static str,
@ -57,7 +66,7 @@ impl CustomList {
} => { } => {
ListNode { ListNode {
name: "Full System Update", name: "Full System Update",
command: include_str!("commands/system-update.sh"), command: with_common_script!("commands/system-update.sh"),
}, },
ListNode { ListNode {
name: "Setup Bash Prompt", name: "Setup Bash Prompt",
@ -77,11 +86,11 @@ impl CustomList {
} => { } => {
ListNode { ListNode {
name: "Build Prerequisites", 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 { ListNode {
name: "Gaming Dependencies", 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 { ListNode {
name: "Recursion?", name: "Recursion?",
@ -94,15 +103,15 @@ impl CustomList {
} => { } => {
ListNode { ListNode {
name: "Alacritty Setup", name: "Alacritty Setup",
command: include_str!("commands/dotfiles/alacritty-setup.sh"), command: with_common_script!("commands/dotfiles/alacritty-setup.sh"),
}, },
ListNode { ListNode {
name: "Kitty Setup", name: "Kitty Setup",
command: include_str!("commands/dotfiles/kitty-setup.sh"), command: with_common_script!("commands/dotfiles/kitty-setup.sh"),
}, },
ListNode { ListNode {
name: "Rofi Setup", name: "Rofi Setup",
command: include_str!("commands/dotfiles/rofi-setup.sh"), command: with_common_script!("commands/dotfiles/rofi-setup.sh"),
}, },
} }
}); });