fixed errors

This commit is contained in:
pika 2025-05-24 14:36:27 +02:00
parent 316379e80b
commit 8078d8d5d1

View file

@ -22,7 +22,7 @@ command_exists() {
# This only wokrs for generic package names, like neovim, or vim, or tmux etc.. # This only wokrs for generic package names, like neovim, or vim, or tmux etc..
# not every package packagemanager has the same packagenames for their packages.. # not every package packagemanager has the same packagenames for their packages..
source-script() { source-script() {
i="https://git.k4li.de/scripts/imports/raw/branch/main/dream.sh" i="$1"
import="$(mktemp)" import="$(mktemp)"
if command_exists curl; then if command_exists curl; then
curl -fsSL $i -o $import curl -fsSL $i -o $import
@ -41,8 +41,12 @@ askThings() {
case "$distro" in case "$distro" in
arch) arch)
choose bar "Choose a bar.." waybar hyprpanel gBar </dev/tty choose bar "Choose a bar.." waybar hyprpanel gBar </dev/tty
[ "$bar" == "gBar" ] && bar=gbar
;;
*)
choose bar "Choose a bar.." waybar gBar </dev/tty
[ "$bar" == "gBar" ] && bar=gbar
;; ;;
*) choose bar "Choose a bar.." waybar gBar </dev/tty ;;
esac esac
pen grey "$bar was picked" pen grey "$bar was picked"
@ -50,17 +54,17 @@ askThings() {
# if ! command_exists rofi && ! command_exists tofi; then # if ! command_exists rofi && ! command_exists tofi; then
choose menu "Choose a menu.." rofi tofi </dev/tty choose menu "Choose a menu.." rofi tofi </dev/tty
pen grey "$menu was picked" pen grey "$menu was picked"
line
choose terminal "Choose a menu.." alacritty foot kitty wezterm </dev/tty choose terminal "Choose a menu.." alacritty foot kitty wezterm </dev/tty
pen grey "$terminal was picked" pen grey "$terminal was picked"
line
removeUnwanted=false removeUnwanted=false
if confirm --default-no "Do you want to also remove conflicting packages?" </dev/tty; then if confirm --default-no "Do you want to also remove conflicting packages?" </dev/tty; then
removeUnwanted=true removeUnwanted=true
fi fi
line
advDeps=( advDeps=(
"${menu:-rofi}" "${menu:-rofi}"
"${terminal:-foot}" "${terminal:-foot}"
@ -78,21 +82,6 @@ instCustom() {
# eval "$(curl -fsSL https://git.k4li.de/scripts/installs/raw/branch/main/hyprpanel.sh)" # eval "$(curl -fsSL https://git.k4li.de/scripts/installs/raw/branch/main/hyprpanel.sh)"
source-script https://git.k4li.de/scripts/installs/raw/branch/main/$_d.sh source-script https://git.k4li.de/scripts/installs/raw/branch/main/$_d.sh
;; ;;
# hyprlock)
# source-script https://git.k4li.de/scripts/installs/raw/branch/main/hyprlock.sh
# ;;
# hyprshot)
# source-script https://git.k4li.de/scripts/installs/raw/branch/main/hyprshot.sh
# ;;
# gBar)
# source-script https://git.k4li.de/scripts/installs/raw/branch/main/gBar.sh
# ;;
# rofi)
# source-script https://git.k4li.de/scripts/installs/raw/branch/main/rofi.sh
# ;;
# swww)
# source-script https://git.k4li.de/scripts/installs/raw/branch/main/swww.sh
# ;;
none) none)
return return
;; ;;
@ -302,8 +291,6 @@ main() {
if [[ ! -d "$HOME/dotfiles" ]]; then if [[ ! -d "$HOME/dotfiles" ]]; then
cloneDotfiles cloneDotfiles
fi fi
# clone
# checkConfig
} }
if setup-env; then if setup-env; then
@ -317,8 +304,8 @@ if setup-env; then
PACKAGE=hyprland PACKAGE=hyprland
if command_exists "$PACKAGE"; then if command_exists "$PACKAGE"; then
echo_warning "$PACKAGE is already installed!" pen bold yellow "$PACKAGE is already installed!"
echo_warning "Exiting now!" pen bold yellow "Exiting now!"
exit 69 exit 69
fi fi