From 539f64a4fc0cfcdc479b6ac4979988a8c64f70fc Mon Sep 17 00:00:00 2001 From: Dmitry Voronin Date: Tue, 13 Feb 2024 23:59:39 +0300 Subject: [PATCH] Bootstrap : Auto-switch to main. --- .README.md | 10 ---------- .bootstrap.sh | 2 ++ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.README.md b/.README.md index b21c0a7..1b56f57 100644 --- a/.README.md +++ b/.README.md @@ -12,10 +12,6 @@ For references, go to the [doc directory](src/branch/main/.doc). curl -s https://git.voronind.com/voronind/linux/raw/branch/master/.bootstrap.sh | bash && source .bashrc ``` -# Load Gnome settings. - -To load Gnome settings run `dconf_load`. - # Conventions. ## File namings. @@ -23,9 +19,3 @@ To load Gnome settings run `dconf_load`. Directory names are `snake_case` so you don't have to release the Shift key 10 times per second when tabing deep for directory. File names are `PascalCase` to differ from directories, also it works nice with things like my archives where underscore and dash separate extra file data. - -## Bash scripting. - -### Variable names. - -Use `SNAKE_CASE_UPPERCASE` for global vars *(careful!)* and `snake_case` for function local vars. For private vars and functions append upperscode like this: `_foo`. diff --git a/.bootstrap.sh b/.bootstrap.sh index ce09816..fa596fd 100644 --- a/.bootstrap.sh +++ b/.bootstrap.sh @@ -13,4 +13,6 @@ git fetch &> /dev/null git reset origin/main &> /dev/null # git checkout -t origin/main git reset --hard HEAD &> /dev/null +git checkout main &> /dev/null git branch --set-upstream-to=origin/main main &> /dev/null +git branch -D master &> /dev/null