Compare commits

..

5 Commits

Author SHA1 Message Date
89cdf8157f Add other missing then. 2025-10-15 05:19:57 -07:00
4e0ff86295 Add missing then. 2025-10-15 05:19:21 -07:00
305b8df6ff Ensure user is on dev branch if it exists. 2025-10-15 05:09:56 -07:00
6a78933875 Add helper for reorienting a git branch. 2025-10-15 04:52:15 -07:00
7095636915 Remove trailing s. 2025-10-14 15:03:43 -07:00
2 changed files with 27 additions and 1 deletions

View File

@@ -48,7 +48,7 @@ fi
if [[ -e "$BACKUP" ]]; then
ls -alh "$BACKUP"
echo "*** '$BACKUP' created successfully! ***"s
echo "*** '$BACKUP' created successfully! ***"
else
echo "*** '$BACKUP' not found! ***"
exit 1

View File

@@ -564,6 +564,13 @@
echo -e "\n*** `basename $project` ***"
cd $project
if [[ -d .git ]]; then
git ls-remote --exit-code origin dev
dev_exists="$?"
if [[ "$dev_exists" == 0 ]]; then
git switch dev
else
git switch main
fi
git pull
git push
else
@@ -881,6 +888,24 @@
alias_sudo: |
# Allows for alias expansions when using sudo, such as doing "sudo ll".
alias sudo="sudo "
function_load_branch: |
# Change a branch to point at another.
function load-branch {
rcvr="$1" # branch which we want to modify
base="$2" # branch with the changes we want
if [[ "$1" == main ]]; then
echo "Are you nuts, fool!? Not main! Do it manually!"
exit 1
fi
git switch "$base"
git branch -f "$rcvr" "$base"
#git switch "$rcvr"
git push --force --set-upstream origin "$rcvr"
git switch "$base"
git branch
}
alias load-prod="load-branch prod dev"
alias load-stage="load-branch stage dev"
- name: General | Account Management | Users | Files | Common Variable
set_fact:
@@ -956,6 +981,7 @@
{{ function_debian_upgrade }}
{{ function_ebook_convert }}
{{ alias_sudo }}
{{ function_load_branch }}
- name: General | Account Management | Users | Files | .bashrc
blockinfile: