Compare commits
	
		
			17 Commits
		
	
	
		
			main
			...
			8445b64d6b
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 8445b64d6b | |||
| 8dfb3fe2a6 | |||
| 5b749d2100 | |||
| 57ca267aa5 | |||
| 2ca308c287 | |||
| 40ee72b587 | |||
| 13bc98d7ef | |||
| d916637798 | |||
| 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,16 @@ | |||||||
|           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 | ||||||
|  |             elif [[ "$dev_exists" == 2 ]]; then | ||||||
|  |               git switch main | ||||||
|  |             else | ||||||
|  |               echo "ERROR: Unknown status for dev_exists, '$dev_exists'." | ||||||
|  |               continue | ||||||
|  |             fi | ||||||
|             git pull |             git pull | ||||||
|             git push |             git push | ||||||
|           else |           else | ||||||
| @@ -881,6 +891,67 @@ | |||||||
|     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 "*** ERROR: Are you nuts, fool!? Not main! Do it manually! ***" | ||||||
|  |           exit 1 | ||||||
|  |         fi | ||||||
|  |  | ||||||
|  |         if [[ -z "$base" ]]; then | ||||||
|  |           if [[ "$rcvr" == "prod" ]]; then | ||||||
|  |             base="stage" | ||||||
|  |           elif [[ "$rcvr" == "stage" ]]; then | ||||||
|  |             base="dev" | ||||||
|  |           else | ||||||
|  |             echo "* Unsure which branch to use for '$rcvr'. Please specify." | ||||||
|  |             exit 1 | ||||||
|  |           fi | ||||||
|  |           echo "* Base was not specified, using '$base' for '$rcvr'." | ||||||
|  |         else | ||||||
|  |           echo "* Requested pointing '$rcvr' branch to '$base'." | ||||||
|  |         fi | ||||||
|  |  | ||||||
|  |         echo -e "\n* Ensuring we are on base branch '$base'." && | ||||||
|  |         git switch "$base" && | ||||||
|  |         echo -e "\n* Changing pointer for '$rcvr' to '$base'." && | ||||||
|  |         git branch -f "$rcvr" "$base" && | ||||||
|  |         #echo -e "\n* Switching to branch '$rcvr'." && | ||||||
|  |         #git switch "$rcvr" && | ||||||
|  |         echo -e "\n* Forcing push on branch '$rcvr'." && | ||||||
|  |         git push --force --set-upstream origin "$rcvr" && | ||||||
|  |         echo -e "\n* Done! Displaying list of remote branches." && | ||||||
|  |         git ls-remote --heads | sort | ||||||
|  |  | ||||||
|  |         if [[ "$base" != "dev" ]]; then | ||||||
|  |           git ls-remote --exit-code --heads origin dev | ||||||
|  |           dev_exists="$?" | ||||||
|  |           if [[ "$dev_exists" == 0 ]]; then | ||||||
|  |             echo -e "\n* Switching back to dev." | ||||||
|  |             git switch dev | ||||||
|  |           elif [[ "$dev_exists" == 2 ]]; then | ||||||
|  |             echo -e "\n* Switching back to main." | ||||||
|  |             git switch main | ||||||
|  |           else | ||||||
|  |             echo "*** ERROR: Unknown status for dev_exists, '$dev_exists'. ***" | ||||||
|  |           fi | ||||||
|  |         fi | ||||||
|  |  | ||||||
|  |         echo -e "\n* Verifying which branch we're on." | ||||||
|  |         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 prod" | ||||||
|  |       alias rollback-dev="load-branch dev stage" | ||||||
|  |       alias reset-prod="load-branch prod main" | ||||||
|  |       alias reset-stage="load-branch stage main" | ||||||
|  |       alias reset-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 +1027,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