diff --git a/README.md b/README.md index 09c14af..c3fcc35 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Tested on and compatible with: ## Install - source <(wget https://raw.githubusercontent.com/andrejusk/dotfiles/master/bootstrap.sh) + bash <(wget https://raw.githubusercontent.com/andrejusk/dotfiles/master/bootstrap.sh) _Running the above without reading through repository is strongly discouraged._ diff --git a/bootstrap.sh b/bootstrap.sh index bb0a001..2941ccb 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Script to set up and install dotfiles repository. +# Script to set up dotfiles repository and run installer. # # Installs git using apt-get if not in $PATH. # Pulls latest dotfiles repository. @@ -8,18 +8,18 @@ # # Usage: # -# i. Source into existing bash shell. -# -# $ source bootstrap.sh -# $ source path/to/bootstrap.sh -# $ source <(wget path.to/bootstrap.sh) -# -# ii. Run in new bash shell. +# i. Run in new bash shell. # # $ bash bootstrap.sh # $ bash path/to/bootstrap.sh # $ bash <(wget path.to/bootstrap.sh) # +# ii. Source into existing bash shell. +# +# $ source bootstrap.sh +# $ source path/to/bootstrap.sh +# $ source <(wget path.to/bootstrap.sh) +# # # Configuration: # @@ -34,16 +34,12 @@ set -o pipefail echo "setting up..." # Variables: git -if [ -z "$REPOSITORY" ]; then - export REPOSITORY="andrejusk/dotfiles" -fi +if [ -z "$REPOSITORY" ]; then export REPOSITORY="andrejusk/dotfiles"; fi readonly repository_url="https://github.com/$REPOSITORY.git" echo "using repository: $repository_url" # Variables: workspace -if [ -z "$WORKSPACE" ]; then - export WORKSPACE="$HOME/workspace" -fi +if [ -z "$WORKSPACE" ]; then export WORKSPACE="$HOME/workspace"; fi readonly dotfiles_dir="$WORKSPACE/dotfiles" echo "using dir: $dotfiles_dir"