From dc0aa9705263bc0200bed6a3b8debc6d6ba90e0c Mon Sep 17 00:00:00 2001 From: Andrei Jiroh Eugenio Halili Date: Mon, 28 Jun 2021 21:46:54 +0800 Subject: [PATCH 1/2] chore(readme): update docs as I changed my username in both places --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9307daf..2da6249 100644 --- a/README.md +++ b/README.md @@ -11,11 +11,11 @@ working at The Pins Team, see [our dotfiles][df-gl]. ```sh ## configure required variables -export GITLAB_LOGIN=AndreiJirohHaliliDev2006 +export GITLAB_LOGIN=ajhalili2006 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/bootstrap | bash - +$(command -v curl>>/dev/null && echo curl -o- || echo wget -q0-) https://raw.githubusercontent.com/ajhalili2006/dotfiles/main/bootstrap | bash - ## Done? unset GITLAB_TOKEN GITLAB_LOGIN @@ -25,7 +25,7 @@ unset GITLAB_TOKEN GITLAB_LOGIN ```sh # assuming git is installed -git clone https://github.com/AndreiJirohHaliliDev2006/dotfiles $HOME/.dotfiles +git clone https://github.com/ajhalili2006/dotfiles $HOME/.dotfiles cd $HOME/.dotfiles # no need for exporting my PAT before running this From 0d7e6978737e7a37c898ee5f223bcc9363b5e165 Mon Sep 17 00:00:00 2001 From: Andrei Jiroh Eugenio Halili Date: Mon, 28 Jun 2021 21:48:57 +0800 Subject: [PATCH 2/2] chore(bootstrap): update repo links and stuff --- bootstrap | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bootstrap b/bootstrap index 13fddcf..d018d9d 100755 --- a/bootstrap +++ b/bootstrap @@ -77,7 +77,7 @@ installDeps() { cloneRepo() { if [ ! -d "$HOME/.dotfiles" ]; then echoStageName "Cloning the dotfiles repo" - git clone https://github.com/AndreiJirohHaliliDev2006/dotfiles.git $HOME/.dotfiles + git clone https://github.com/ajhalili2006/dotfiles.git $HOME/.dotfiles else echoStageName "Dotfiles repo found, pulling remote changes instead" git -C "$HOME/.dotfiles" fetch --all @@ -88,14 +88,14 @@ cloneRepo() { if [[ $GITLAB_TOKEN == "" ]] && [[ $GITLAB_LOGIN == "" ]]; then error "GitLab login and token can't be blank!" && exit 1 # Probably change my GitLab SaaS username with yours - elif [[ $GITLAB_LOGIN != "AndreiJirohHaliliDev2006" ]]; then + elif [[ $GITLAB_LOGIN != "ajhalili2006" ]]; then error "Only Andrei Jiroh can do this!" && exit 1 - elif [[ $GITLAB_LOGIN == "AndreiJirohHaliliDev2006" ]] && [[ $GITLAB_TOKEN == "" ]]; then + elif [[ $GITLAB_LOGIN == "ajhalili2006" ]] && [[ $GITLAB_TOKEN == "" ]]; then error "Missing GitLab SaaS PAT! Check your Bitwarden vault for that key." && exit 1 fi if [ ! -d "$HOME/.dotfiles/secrets" ]; then echoStageName "Cloning secrets repo" - git clone https://$GITLAB_LOGIN:$GITLAB_TOKEN@gitlab.com/AndreiJirohHaliliDev2006/dotfiles-secrets $HOME/.dotfiles/secrets + git clone https://$GITLAB_LOGIN:$GITLAB_TOKEN@gitlab.com/ajhalili2006/dotfiles-secrets $HOME/.dotfiles/secrets [ $? != "0" ] && echo "error: That kinda sus, but either only Andrei Jiroh can proceed or maybe the PAT you used is invalid." && exit 1 chmod 600 $HOME/.dotfiles/secrets/{ssh,pgp} sleep 5