diff --git a/files/.bashrc b/files/.bashrc index d7f9c40..32995c7 100644 --- a/files/.bashrc +++ b/files/.bashrc @@ -37,9 +37,9 @@ if [ -d "$HOME/bin" ] ; then fi # source misc user scripts -if [ -d ~/git/dotfiles/files ] ; then - . ~/git/dotfiles/files/* -fi +#if [ -d ~/git/dotfiles/files ] ; then +# . ~/git/dotfiles/files/.* +#fi # source headscale autocompletion script if [ -f ~/.autoheadscale ] ; then diff --git a/files/.profile b/files/.profile index db87235..c9e02cd 100644 --- a/files/.profile +++ b/files/.profile @@ -2,9 +2,9 @@ TODELETE="$(command ls --almost-all ~/git/dotfiles/files)" if [ -d ~/git/dotfiles ] ; then bash ~/git/dotfiles/pull.sh - (cd ~ ; rm $TODELETE) + (cd ~ ; rm $(command ls --almost-all ~/git/dotfiles/files)) (cd ~/git/dotfiles - ln ./files/* ../../) + ln ./files/.* ../../) fi . ~/.bashrc diff --git a/setup.sh b/setup.sh index 0de45d3..c68197a 100644 --- a/setup.sh +++ b/setup.sh @@ -6,8 +6,8 @@ TODELETE="$(command ls --almost-all files) .PS1" (cd ../.. ; rm $TODELETE) (cd /root ; rm $TODELETE) -cp ./files/* /root -ln ./files/* ../../ +cp -r ./files/. /root +ln ./files/.* ../../ # dotenv if [ ! -f ../../.env ] ; then