From 47378cfac55adaf6754b1f44808086f740cfa366 Mon Sep 17 00:00:00 2001 From: Solomon Laing Date: Wed, 11 Jun 2025 20:29:35 +0930 Subject: [PATCH] better --- arch/{runs => }/default-programs | 1 + arch/inkos-run | 9 +++++++-- arch/runs/{dwmblocks => blocks} | 2 -- arch/runs/config | 2 -- arch/runs/dependencies | 2 -- arch/runs/dmenu | 2 -- arch/runs/dwm | 2 -- arch/runs/fonts | 2 -- arch/runs/misc | 3 --- arch/runs/neovim | 2 -- arch/runs/st | 2 -- arch/runs/yay | 2 -- 12 files changed, 8 insertions(+), 23 deletions(-) rename arch/{runs => }/default-programs (99%) rename arch/runs/{dwmblocks => blocks} (99%) diff --git a/arch/runs/default-programs b/arch/default-programs similarity index 99% rename from arch/runs/default-programs rename to arch/default-programs index fd382ae..190fc20 100644 --- a/arch/runs/default-programs +++ b/arch/default-programs @@ -1,5 +1,6 @@ DEPENDENCIES_START yad +less playerctl zip xorg-xmessage diff --git a/arch/inkos-run b/arch/inkos-run index 9ab60d6..28b3efb 100755 --- a/arch/inkos-run +++ b/arch/inkos-run @@ -11,8 +11,7 @@ case $input in echo "continuing..." ;; esac - -check +./check script_dir=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd) filter="" @@ -56,4 +55,10 @@ for script in $scripts; do fi execute "$script" + + if [[ $? -gt 0 ]]; then + echo "Something went wrong..." + fi + + read -r -p "Press [ENTER] to continue" done diff --git a/arch/runs/dwmblocks b/arch/runs/blocks similarity index 99% rename from arch/runs/dwmblocks rename to arch/runs/blocks index 38dff93..f01026f 100755 --- a/arch/runs/dwmblocks +++ b/arch/runs/blocks @@ -8,8 +8,6 @@ # Installs my customisation of dwmblocks #----------------------------------- -clear - if command -v dwmblocks &>/dev/null; then echo "dwmblocks is already installed on the system." exit 0 diff --git a/arch/runs/config b/arch/runs/config index 9e7955d..73bd4d4 100755 --- a/arch/runs/config +++ b/arch/runs/config @@ -8,8 +8,6 @@ # Installs my dotfiles #----------------------------------- -clear - echo "This script is going to install my dotfiles." function config { diff --git a/arch/runs/dependencies b/arch/runs/dependencies index 85acd54..e2cc9a7 100755 --- a/arch/runs/dependencies +++ b/arch/runs/dependencies @@ -8,8 +8,6 @@ # Intsalls all of my system dependencies #----------------------------------- -clear - default_programs="./default-programs" dependencies=$(sed -n '/DEPENDENCIES_START/,/DEPENDENCIES_END/p' $default_programs | sed -e 's/DEPENDENCIES_START//' -e 's/DEPENDENCIES_END//') laptop_dependencies=$(sed -n '/DEPENDENCIES_LAPTOP_START/,/DEPENDENCIES_LAPTOP_END/p' $default_programs | sed -e 's/DEPENDENCIES_LAPTOP_START//' -e 's/DEPENDENCIES_LAPTOP_END//') diff --git a/arch/runs/dmenu b/arch/runs/dmenu index 385e5d4..0585495 100755 --- a/arch/runs/dmenu +++ b/arch/runs/dmenu @@ -8,8 +8,6 @@ # Installs my customisation of dmenu #----------------------------------- -clear - if command -v dmenu &>/dev/null; then echo "dmenu is already installed on the system." exit 0 diff --git a/arch/runs/dwm b/arch/runs/dwm index 56b01ce..335d3d1 100755 --- a/arch/runs/dwm +++ b/arch/runs/dwm @@ -8,8 +8,6 @@ # Installs my customisation of dwm #----------------------------------- -clear - if command -v dwm &>/dev/null; then echo "dwm is already installed on the system." exit 0 diff --git a/arch/runs/fonts b/arch/runs/fonts index 5e90e8c..6585a2e 100755 --- a/arch/runs/fonts +++ b/arch/runs/fonts @@ -9,8 +9,6 @@ # system. #----------------------------------- -clear - if command -v getnf &>/dev/null; then echo "getnf is already installed on the system." exit 0 diff --git a/arch/runs/misc b/arch/runs/misc index 5262b08..97828d5 100755 --- a/arch/runs/misc +++ b/arch/runs/misc @@ -9,8 +9,6 @@ # the system. #----------------------------------- -clear - default_programs="./default-programs" dependencies=$(sed -n '/MISC_START/,/MISC_END/p' $default_programs | sed -e 's/MISC_START//' -e 's/MISC_END//') @@ -28,7 +26,6 @@ failures=() # run though each dependency and install it if it's not already installed for dependency in $dependencies; do sudo -v - clear if ! yay -Qi $dependency &>/dev/null; then echo "Installing $dependency and it's dependencies..." yay -S --noconfirm $dependency diff --git a/arch/runs/neovim b/arch/runs/neovim index 5d51afe..8748365 100755 --- a/arch/runs/neovim +++ b/arch/runs/neovim @@ -8,8 +8,6 @@ # Installs neovim on the system. #----------------------------------- -clear - if command -v neovim &>/dev/null; then echo "neovim is already installed on the system." exit 0 diff --git a/arch/runs/st b/arch/runs/st index ce66584..88a6c1b 100755 --- a/arch/runs/st +++ b/arch/runs/st @@ -8,8 +8,6 @@ # Installs my customisation of st #----------------------------------- -clear - if command -v st &>/dev/null; then echo "st is already installed on the system." exit 0 diff --git a/arch/runs/yay b/arch/runs/yay index 52aa15f..4844819 100755 --- a/arch/runs/yay +++ b/arch/runs/yay @@ -9,8 +9,6 @@ # system. #----------------------------------- -clear - if command -v yay &>/dev/null; then echo "yay is already installed on the system." exit 0