scripts/imports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

renamed functions _install and _rename to pkg-install and pkg-rename

Browse source
This commit is contained in:
pika 2025-05-22 11:20:28 +02:00
parent 66299ddd7c
commit e658c15358
1 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
distros.sh
View file

@ -137,7 +137,6 @@ source_script() {
sleep 0.1 sleep 0.1
return 0 return 0
else else
echo_info "Sourcing external script:${NC} $url"
# ─< if $1 is a url, grab it and source it, also deletes afterwards >───────────────────── # ─< if $1 is a url, grab it and source it, also deletes afterwards >─────────────────────
if command_exists curl; then if command_exists curl; then
curl -fsSL $url -o $import curl -fsSL $url -o $import
@ -149,6 +148,8 @@ source_script() {
fi fi
source "$import" source "$import"
echo "${BLUE}Sourcing external script:${NC} $url"
sleep 0.1 sleep 0.1
rm -f "$import" rm -f "$import"
fi fi
@ -177,7 +178,7 @@ checkAndInstall() {
# ─< if it's not a list, then just check and install the package.. >────────────────────── # ─< if it's not a list, then just check and install the package.. >──────────────────────
if [[ -z $2 ]]; then if [[ -z $2 ]]; then
if ! command_exists "$1"; then if ! command_exists "$1"; then
if run-silent _install "$1"; then if run-silent pkg_install "$1"; then
echo_pkg deps "$1 - ${GREEN}installed" echo_pkg deps "$1 - ${GREEN}installed"
else else
echo_pkg deps "$1 is already installed.." echo_pkg deps "$1 is already installed.."
@ -192,7 +193,7 @@ checkAndInstall() {
for deps in "${@}"; do for deps in "${@}"; do
# echo_pkg deps "Installing $deps" # echo_pkg deps "Installing $deps"
if ! command_exists $deps; then if ! command_exists $deps; then
if run-silent _install "$deps"; then if run-silent pkg_install "$deps"; then
echo_pkg deps "$deps - ${GREEN}installed" echo_pkg deps "$deps - ${GREEN}installed"
else else
echo_pkg deps "$deps is already installed.." echo_pkg deps "$deps is already installed.."
@ -244,13 +245,13 @@ check_env() {
# CAUTION: # CAUTION:
# ╭─────────────────────────────────────────────────────────────────────╮ # ╭─────────────────────────────────────────────────────────────────────╮
# │ This can break really quickly, since the _remove() function removes │ # │ This can break really quickly, since the pkg-remove() function removes │
# │ without confirmation! use with CAUTION!! │ # │ without confirmation! use with CAUTION!! │
# ╰─────────────────────────────────────────────────────────────────────╯ # ╰─────────────────────────────────────────────────────────────────────╯
_setup() { _setup() {
case "$1" in case "$1" in
debian | ubuntu) debian | ubuntu)
_install() { pkg_install() {
# $_sudo apt-get install --assume-yes "$@" # $_sudo apt-get install --assume-yes "$@"
if command_exists nala; then if command_exists nala; then
pkger=nala pkger=nala
@ -262,7 +263,7 @@ _setup() {
} }
# CAUTION: # CAUTION:
_remove() { pkg-remove() {
if command_exists nala; then if command_exists nala; then
pkger=nala pkger=nala
$_sudo nala remove --assume-yes "$@" $_sudo nala remove --assume-yes "$@"
@ -277,13 +278,13 @@ _setup() {
} }
;; ;;
fedora) fedora)
_install() { pkg_install() {
pkger=dnf pkger=dnf
$_sudo dnf -y install "$@" $_sudo dnf -y install "$@"
} }
# CAUTION: # CAUTION:
_remove() { pkg-remove() {
pkger=dnf pkger=dnf
$_sudo dnf -y remove "$@" $_sudo dnf -y remove "$@"
} }
@ -297,7 +298,7 @@ _setup() {
fi fi
} }
_install() { pkg_install() {
if command_exists paru; then if command_exists paru; then
pkger=paru pkger=paru
# echo_pkg "Using paru" # echo_pkg "Using paru"
@ -314,7 +315,7 @@ _setup() {
} }
# CAUTION: # CAUTION:
_remove() { pkg-remove() {
if command_exists paru; then if command_exists paru; then
pkger=paru pkger=paru
# echo_info "Using paru" # echo_info "Using paru"
@ -331,25 +332,25 @@ _setup() {
} }
;; ;;
opensuse) opensuse)
_install() { pkg_install() {
pkger=zypper pkger=zypper
$_sudo zypper in "$@" $_sudo zypper in "$@"
} }
# CAUTION: # CAUTION:
_remove() { pkg-remove() {
pkger=zypper pkger=zypper
$_sudo zypper rem "$@" $_sudo zypper rem "$@"
} }
;; ;;
alpine) alpine)
_install() { pkg_install() {
pkger=apk pkger=apk
apk add "$@" apk add "$@"
} }
# CAUTION: # CAUTION:
_remove() { pkg-remove() {
pkger=apk pkger=apk
apk remove "$@" apk remove "$@"
} }