Compare commits
9 Commits
main
...
71d236d0ba
| Author | SHA1 | Date | |
|---|---|---|---|
| 71d236d0ba | |||
| d81c424878 | |||
| 73e527640f | |||
| aa3075a9fc | |||
| 89cdf8157f | |||
| 4e0ff86295 | |||
| 305b8df6ff | |||
| 6a78933875 | |||
| 7095636915 |
@@ -48,7 +48,7 @@ fi
|
|||||||
|
|
||||||
if [[ -e "$BACKUP" ]]; then
|
if [[ -e "$BACKUP" ]]; then
|
||||||
ls -alh "$BACKUP"
|
ls -alh "$BACKUP"
|
||||||
echo "*** '$BACKUP' created successfully! ***"s
|
echo "*** '$BACKUP' created successfully! ***"
|
||||||
else
|
else
|
||||||
echo "*** '$BACKUP' not found! ***"
|
echo "*** '$BACKUP' not found! ***"
|
||||||
exit 1
|
exit 1
|
||||||
|
|||||||
@@ -564,6 +564,13 @@
|
|||||||
echo -e "\n*** `basename $project` ***"
|
echo -e "\n*** `basename $project` ***"
|
||||||
cd $project
|
cd $project
|
||||||
if [[ -d .git ]]; then
|
if [[ -d .git ]]; then
|
||||||
|
git ls-remote --exit-code --heads origin dev
|
||||||
|
dev_exists="$?"
|
||||||
|
if [[ "$dev_exists" == 0 ]]; then
|
||||||
|
git switch dev
|
||||||
|
else
|
||||||
|
git switch main
|
||||||
|
fi
|
||||||
git pull
|
git pull
|
||||||
git push
|
git push
|
||||||
else
|
else
|
||||||
@@ -881,6 +888,30 @@
|
|||||||
alias_sudo: |
|
alias_sudo: |
|
||||||
# Allows for alias expansions when using sudo, such as doing "sudo ll".
|
# Allows for alias expansions when using sudo, such as doing "sudo ll".
|
||||||
alias sudo="sudo "
|
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 [[ "$rcvr" == main ]]; then
|
||||||
|
echo "Are you nuts, fool!? Not main! Do it manually!"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if [[ -z "$base" ]]; then
|
||||||
|
base="dev"
|
||||||
|
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"
|
||||||
|
alias load-stage="load-branch stage"
|
||||||
|
alias rollback-prod="load-branch prod main"
|
||||||
|
alias rollback-stage="load-branch stage main"
|
||||||
|
alias rollback-dev="load-branch dev main"
|
||||||
|
|
||||||
- name: General | Account Management | Users | Files | Common Variable
|
- name: General | Account Management | Users | Files | Common Variable
|
||||||
set_fact:
|
set_fact:
|
||||||
@@ -956,6 +987,7 @@
|
|||||||
{{ function_debian_upgrade }}
|
{{ function_debian_upgrade }}
|
||||||
{{ function_ebook_convert }}
|
{{ function_ebook_convert }}
|
||||||
{{ alias_sudo }}
|
{{ alias_sudo }}
|
||||||
|
{{ function_load_branch }}
|
||||||
|
|
||||||
- name: General | Account Management | Users | Files | .bashrc
|
- name: General | Account Management | Users | Files | .bashrc
|
||||||
blockinfile:
|
blockinfile:
|
||||||
|
|||||||
Reference in New Issue
Block a user