From c7a73e5b9354e0dbd19f1169bba86b0849d9acad Mon Sep 17 00:00:00 2001 From: Andrei Jiroh Eugenio Halili Date: Mon, 7 Jun 2021 21:12:09 +0800 Subject: [PATCH] chore(global): fix syntax errors + update readme regarding variable changes Signed-off-by: Andrei Jiroh Eugenio Halili --- README.md | 9 ++++++--- dotfiles-bootstrapper-script.sh | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a0a6b15..38ad2b9 100644 --- a/README.md +++ b/README.md @@ -11,14 +11,14 @@ working at The Pins Team, see [our dotfiles][df-gl]. ```sh ## configure required variables -export GH_USERNAME=AndreiJirohHaliliDev2006 -export GH_PAT= +export GITLAB_LOGIN=AndreiJirohHaliliDev2006 +export GITLAB_TOKEN= ## Run the bootstrap script $(command -v curl>>/dev/null && echo curl -o- || echo wget -q0-) https://raw.githubusercontent.com/AndreiJirohHaliliDev2006/dotfiles/main/dotfiles-bootstrapper-script.sh | bash - ## Done? -unset GH_USERNAME GH_PAT +unset GITLAB_TOKEN GITLAB_LOGIN ``` ### With Cloning the Repo @@ -30,6 +30,9 @@ cd $HOME/.dotfiles # no need for exporting my PAT before running this ./setup.sh [android|ubuntu-debian|arch|alpine|macos] + +# you may optionally run the bootstrapper script if you want +GITLAB_LOGIN=AndreiJirohHaliliDev2006 GITLAB_TOKEN= ./bootstrap ``` ## Want to fork me owo? diff --git a/dotfiles-bootstrapper-script.sh b/dotfiles-bootstrapper-script.sh index 9242d93..57a789b 100644 --- a/dotfiles-bootstrapper-script.sh +++ b/dotfiles-bootstrapper-script.sh @@ -125,7 +125,7 @@ elif echo "$OSTYPE" | grep -qE '^linux-gnu.*' && [ -f '/etc/debian_version' ]; t fi if [[ $SKIP_CONFIG_LINKING == "" ]] && [ ! -f "~/.gitconfig" ]; then ln -s $HOME/.dotfiles/linux.gitconfig ~/.gitconfig - elif [[ $SKIP_CONFIG_LINKING == "" && [ -f "~/.gitconfig" ]; then + elif [[ $SKIP_CONFIG_LINKING == "" ]] && [ -f "~/.gitconfig" ]; then echo "warning: Existing Git configuration found, please manually merge them." fi sleep 5