From c999ca0655e7b5b2d8b46c0cc1fa5de0a62ac167 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 31 Aug 2026 23:27:31 -0400 Subject: [PATCH] added user recognition, more pauses, and more specific mkdir calls --- ygdra.sh | 45 +++++++++++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/ygdra.sh b/ygdra.sh index a2d56f8..9d9d4de 100755 --- a/ygdra.sh +++ b/ygdra.sh @@ -86,6 +86,7 @@ # 08-29-2026: added fisher install to arch #*08-31-2026: added status prints and pauses for debugging # added if shell not fish, chsh fish +# capture user # # ============================================================================== @@ -106,6 +107,11 @@ # TODO i'm certain there's a better way to do this CWD=$( pwd ) cd ~ +HOME=$( pwd ) + +USERS_BAD=$( users ) +USERS=($USERS_BAD) + # TODO filter out the obvious part RELEASE=$( cat /etc/os-release | grep -i "^id=" ) OS="" @@ -149,6 +155,7 @@ case $RELEASE in esac echo "CWD = $CWD" +echo "HOME = $HOME" echo "" echo "OS = $OS" echo "INS = $INS" @@ -437,17 +444,24 @@ if [[ $OS = "arch" ]]; then $INS $NOCONF $FLAG fisher echo "creating dirs" - mkdir ~/Documents - mkdir ~/Projects - mkdir ~/Pictures + read + + mkdir -p $HOME/Documents + echo "mkdir documents status = $?" + mkdir -p $HOME/Projects + echo "mkdir projects status = $?" + mkdir -p $HOME/Pictures + echo "mkdir pictures status = $?" echo "installing paru" - mkdir -p ~/Documents/paru/src - cd ~/Documents/paru/src + read + + mkdir -p $HOME/Documents/paru/src + cd $HOME/Documents/paru/src git clone https://aur.archlinux.org/paru.git cd paru makepkg -si - cd ~ + cd $HOME # download acli ( x86 ) echo "download acli bin" @@ -473,7 +487,10 @@ if [[ $OS = "arch" ]]; then if [[ $MODE -eq 2 ]]; then #$INS $NOCONF $FLAG echo "make Util dir" - mkdir ~/Utilities + read + mkdir -p $HOME/Utilities + echo "mkdir util status = $?" + read echo "installing gitea" $INS $NOCONF $FLAG gitea #echo "installing pihole" @@ -542,7 +559,7 @@ read if [[ $SHELL != "/usr/bin/fish" && $SHELL != "/bin/fish" ]]; then echo "changing shell" - chsh -s /usr/bin/fish + chsh -s /usr/bin/fish ${USERS[0]} read fi @@ -558,20 +575,22 @@ $INS $NOCONF $FLAG tmux echo "installing tldr" $INS $NOCONF $FLAG tealdeer +read + # install acli echo "installing acli" chmod u+x ~/acli mv ~/acli /usr/local/bin/ +read + ## user specific general install ## operating mode specific general install if [[ $MODE -eq 2 ]]; then echo "installing caddy ( based )" $INS $NOCONF $FLAG caddy - # make directory for dynamic dns service - mkdir -p ~/.config/dynu - + read cd $CWD # copy dynu service and timer ln -s $CWD/.config/dynu/dynu.timer /etc/systemd/system/ @@ -582,10 +601,12 @@ fi # GIT_CLONES -cd ~/Projects +cd $HOME/Projects #git clone https://github.com/alexander-the-alright/ #git clone https://codeberg.org/alexander-the-alright/ekho git clone https://earth-1.net/oracle/ekho +echo "ekho clone status = $?" +read # TODO install exit