diff --git a/Linux/functions.sh b/Linux/dot-functions.sh similarity index 100% rename from Linux/functions.sh rename to Linux/dot-functions.sh diff --git a/Linux/zshenv.sh b/Linux/dot-zshenv.sh similarity index 100% rename from Linux/zshenv.sh rename to Linux/dot-zshenv.sh diff --git a/Linux/zshrc.sh b/Linux/dot-zshrc.sh similarity index 100% rename from Linux/zshrc.sh rename to Linux/dot-zshrc.sh diff --git a/Linux/dotfiles.sh b/Linux/dotfiles.sh index 40a9236..f9acc60 100755 --- a/Linux/dotfiles.sh +++ b/Linux/dotfiles.sh @@ -3,21 +3,15 @@ # dotfiles.sh - the Linux version # TODO: If setup before, prompt to continue since this wipes out current setup -source "$DOTFILES_ROOT/Mac/Home/dot-functions.sh" +source "$DOTFILES_ROOT/Linux/dot-functions.sh" message "dotfiles.sh -- clean setup up for macOS via ${DOTFILES_ROOT}" # If git and a compiler isn't installed, then abort the install # TODO: check if git, cc, or other needed tools are available -echo -# ============================================================================== -alert "SUDO Password Required to unsure proper permissions and ownership" -# read -s -k $'?Press any key to continue. Hit Control-C to abort now.\n' -echo - -sudo chown -R $USER ${DOTFILES_ROOT}/* 2> /dev/null -sudo chmod -R 777 ${DOTFILES_ROOT}/* 2> /dev/null +chown -R $USER ${DOTFILES_ROOT}/* 2> /dev/null +chmod -R 777 ${DOTFILES_ROOT}/* 2> /dev/null # Un-set the quarantine bit for all my own script files xattr -d com.apple.quarantine ${DOTFILES_ROOT}/* 2> /dev/null diff --git a/Linux/setup-linux.sh b/Linux/setup-linux.sh deleted file mode 100755 index 1e65455..0000000 --- a/Linux/setup-linux.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/zsh -# -# setup-linux.sh - the Linux version - -echo "setup-linux.sh -- setting up for Linux" -echo - -exit 0 - - -####### ABORTING FOR NOW diff --git a/Linux/update-linux.sh b/Linux/update-linux.sh deleted file mode 100755 index 25dc8c2..0000000 --- a/Linux/update-linux.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/zsh -# -# update-shell.sh - -# Import the default functions used in these scripts -source $(dirname $0)/functions.sh -message "update-shell.sh" "Configuring shell and OS settings." - - -#### Switch to ZSH if not already using it -if [ "$SHELL" != "/bin/zsh" ]; then - error "SHELL is not set to ZSH" "Switching to ZSH - needs authentication" - chsh -s $(which zsh) -fi - -# Copy the dotfiles to the $HOME folder (copies over any existing files) -cp ${DOTFILES_ROOT}/Mac/aliases.sh $HOME/.aliases -cp ${DOTFILES_ROOT}/Mac/functions.sh $HOME/.functions -cp ${DOTFILES_ROOT}/Mac/zshrc.sh $HOME/.zshrc -# cp ${DOTFILES_ROOT}/Mac/zprofile.sh $HOME/.zprofile - -cp ${DOTFILES_ROOT}/Mac/test.sh ${DEVELOPER_BIN}/ -sudo chmod -R 777 ${DEVELOPER_BIN}/* - - -# Hard code the critical source folders into the ~/.zshrc file -echo " " >> ~/.zshrc -echo "# ============================================================" >> ~/.zshrc -echo "# Hard coded variables used by dot installer scripts " >> ~/.zshrc -echo " " >> ~/.zshrc -echo "export DOTFILES_ROOT=$DOTFILES_ROOT" >> ~/.zshrc -echo "export DEVELOPER_HOME=$DEVELOPER_HOME" >> ~/.zshrc -echo "export DEVELOPER_BIN=$DEVELOPER_BIN" >> ~/.zshrc - - - - -# ============================================================================== -exit 0 - - diff --git a/todo.md b/todo.md index e5aab7e..c2692b9 100644 --- a/todo.md +++ b/todo.md @@ -1,6 +1,7 @@ # TODO Items -- Report current ruby, swift, python, and Homebrew versions on setup +- Add basic support for Linux +- Report current ruby, swift, python, and Homebrew versions on setup - Function to delete `./DS_Store` files recursively down a folder structure