mirror of
https://github.com/ChrisTitusTech/linutil.git
synced 2024-11-05 21:28:48 +00:00
Merge pull request #60 from lj3954/use_common_script
refactor: Use common script to avoid code duplication
This commit is contained in:
Chris Titus
GitHub
commit
df563ad6a1
|
|
@ -1,28 +1,33 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
# shellcheck disable=SC2034
|
||||
|
||||
RC='\033[0m'
|
||||
RED='\033[31m'
|
||||
YELLOW='\033[33m'
|
||||
GREEN='\033[32m'
|
||||
|
||||
command_exists() {
|
||||
which $1 >/dev/null 2>&1
|
||||
which "$1" >/dev/null 2>&1
|
||||
}
|
||||
|
||||
checkEnv() {
|
||||
|
||||
checkCommandRequirements() {
|
||||
## Check for requirements.
|
||||
REQUIREMENTS='curl groups sudo'
|
||||
REQUIREMENTS=$1
|
||||
for req in ${REQUIREMENTS}; do
|
||||
if ! command_exists ${req}; then
|
||||
echo -e "${RED}To run me, you need: ${REQUIREMENTS}${RC}"
|
||||
if ! command_exists "${req}"; then
|
||||
echo "${RED}To run me, you need: ${REQUIREMENTS}${RC}"
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
## Check Package Handler
|
||||
PACKAGEMANAGER='apt-get dnf pacman zypper'
|
||||
checkPackageManager() {
|
||||
## Check Package Manager
|
||||
PACKAGEMANAGER=$1
|
||||
for pgm in ${PACKAGEMANAGER}; do
|
||||
if command_exists ${pgm}; then
|
||||
if command_exists "${pgm}"; then
|
||||
PACKAGER=${pgm}
|
||||
echo "Using ${pgm}"
|
||||
break
|
||||
|
|
@ -33,11 +38,13 @@ checkEnv() {
|
|||
echo -e "${RED}Can't find a supported package manager${RC}"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
checkSuperUser() {
|
||||
## Check SuperUser Group
|
||||
SUPERUSERGROUP='wheel sudo root'
|
||||
for sug in ${SUPERUSERGROUP}; do
|
||||
if groups | grep -q ${sug}; then
|
||||
if groups | grep -q "${sug}"; then
|
||||
SUGROUP=${sug}
|
||||
echo "Super user group ${SUGROUP}"
|
||||
break
|
||||
|
|
@ -45,11 +52,22 @@ checkEnv() {
|
|||
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}"
|
||||
if ! groups | grep -q "${SUGROUP}"; then
|
||||
echo "${RED}You need to be a member of the sudo group to run me!${RC}"
|
||||
exit 1
|
||||
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
|
||||
# Use /etc/os-release for modern distro identification
|
||||
if [ -f /etc/os-release ]; then
|
||||
|
|
@ -57,3 +75,10 @@ checkEnv() {
|
|||
DTYPE=$ID
|
||||
fi
|
||||
}
|
||||
|
||||
checkEnv() {
|
||||
checkCommandRequirements 'curl groups sudo'
|
||||
checkPackageHandler 'apt-get dnf pacman zypper'
|
||||
checkSuperUser
|
||||
checkDistro
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,61 +1,10 @@
|
|||
#!/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
|
||||
checkCommandRequirements 'curl groups sudo'
|
||||
checkPackageManager 'apt-get dnf pacman zypper'
|
||||
checkSuperUser
|
||||
checkDistro
|
||||
}
|
||||
|
||||
setupAlacritty() {
|
||||
|
|
|
|||
|
|
@ -1,61 +1,10 @@
|
|||
#!/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
|
||||
checkCommandRequirements 'curl groups sudo'
|
||||
checkPackageManager 'apt-get dnf pacman zypper'
|
||||
checkSuperUser
|
||||
checkDistro
|
||||
}
|
||||
|
||||
setupKitty() {
|
||||
|
|
@ -63,10 +12,10 @@ setupKitty() {
|
|||
if ! command_exists kitty; then
|
||||
case ${PACKAGER} in
|
||||
pacman)
|
||||
sudo ${PACKAGER} -S --noconfirm kitty
|
||||
sudo "${PACKAGER}" -S --noconfirm kitty
|
||||
;;
|
||||
*)
|
||||
sudo ${PACKAGER} install -y kitty
|
||||
sudo "${PACKAGER}" install -y kitty
|
||||
;;
|
||||
esac
|
||||
else
|
||||
|
|
@ -74,11 +23,11 @@ setupKitty() {
|
|||
fi
|
||||
echo "Copy Kitty config files"
|
||||
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
|
||||
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/nord.conf https://github.com/ChrisTitusTech/dwm-titus/raw/main/config/kitty/nord.conf
|
||||
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/nord.conf https://github.com/ChrisTitusTech/dwm-titus/raw/main/config/kitty/nord.conf
|
||||
}
|
||||
|
||||
checkEnv
|
||||
|
|
|
|||
|
|
@ -1,61 +1,10 @@
|
|||
#!/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
|
||||
checkCommandRequirements 'curl groups sudo'
|
||||
checkPackageManager 'apt-get dnf pacman zypper'
|
||||
checkSuperUser
|
||||
checkDistro
|
||||
}
|
||||
|
||||
setupRofi() {
|
||||
|
|
|
|||
|
|
@ -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,57 +22,11 @@ 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
|
||||
checkCommandRequirements 'curl groups sudo'
|
||||
checkPackageHandler 'apt yum dnf pacman zypper'
|
||||
checkCurrentDirectoryWritable
|
||||
checkSuperUser
|
||||
}
|
||||
|
||||
installDepend() {
|
||||
|
|
@ -109,30 +58,30 @@ installDepend() {
|
|||
echo "No AUR helper found. Please install yay or paru."
|
||||
exit 1
|
||||
fi
|
||||
"$AUR_HELPER" --noconfirm -S $DEPENDENCIES
|
||||
"$AUR_HELPER" --noconfirm -S "$DEPENDENCIES"
|
||||
;;
|
||||
apt)
|
||||
COMPILEDEPS='build-essential'
|
||||
sudo "$PACKAGER" update
|
||||
sudo dpkg --add-architecture i386
|
||||
sudo "$PACKAGER" update
|
||||
sudo "$PACKAGER" install -y $DEPENDENCIES $COMPILEDEPS
|
||||
sudo "$PACKAGER" install -y "$DEPENDENCIES" $COMPILEDEPS
|
||||
;;
|
||||
dnf)
|
||||
COMPILEDEPS='@development-tools'
|
||||
sudo "$PACKAGER" update
|
||||
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
|
||||
;;
|
||||
zypper)
|
||||
COMPILEDEPS='patterns-devel-base-devel_basis'
|
||||
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" install -y $DEPENDENCIES
|
||||
sudo "$PACKAGER" install -y "$DEPENDENCIES"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,58 +1,10 @@
|
|||
#!/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
|
||||
|
||||
checkCommandRequirements 'curl groups sudo'
|
||||
checkPackageManager 'apt-get yum dnf pacman zypper'
|
||||
checkCurrentDirectoryWritable
|
||||
checkSuperUser
|
||||
}
|
||||
|
||||
installDepend() {
|
||||
|
|
|
|||
|
|
@ -1,60 +1,10 @@
|
|||
#!/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
|
||||
checkCommandRequirements 'curl groups sudo'
|
||||
checkPackageManager 'apt-get nala dnf pacman zypper yum xbps-install'
|
||||
checkSuperUser
|
||||
checkDistro
|
||||
}
|
||||
|
||||
fastUpdate() {
|
||||
|
|
@ -125,15 +75,15 @@ updateSystem() {
|
|||
echo -e "${GREEN}Updating system${RC}"
|
||||
case ${PACKAGER} in
|
||||
nala|apt-get)
|
||||
sudo ${PACKAGER} update -y
|
||||
sudo ${PACKAGER} upgrade -y
|
||||
sudo "${PACKAGER}" update -y
|
||||
sudo "${PACKAGER}" upgrade -y
|
||||
;;
|
||||
yum|dnf)
|
||||
sudo ${PACKAGER} update -y
|
||||
sudo ${PACKAGER} upgrade -y
|
||||
sudo "${PACKAGER}" update -y
|
||||
sudo "${PACKAGER}" upgrade -y
|
||||
;;
|
||||
pacman)
|
||||
sudo ${PACKAGER} -Syu --noconfirm
|
||||
sudo "${PACKAGER}" -Syu --noconfirm
|
||||
;;
|
||||
zypper)
|
||||
sudo ${PACKAGER} ref
|
||||
|
|
|
|||
21
src/list.rs
21
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"),
|
||||
},
|
||||
}
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user