Compare commits
10 Commits
ad6b9d4794
...
prod
| Author | SHA1 | Date | |
|---|---|---|---|
| 195c315714 | |||
| b91b43b56d | |||
| a64f2253b6 | |||
| 7f21a0fc7b | |||
| 87aca38811 | |||
| 9ce7c641af | |||
| 71cf71e29b | |||
| 58525e2a5c | |||
| f7869fd453 | |||
| 95212b1c73 |
@@ -39,7 +39,7 @@ echo "*** Creating backup at '$BACKUP' ***"
|
||||
sudo zip -rv "$BACKUP" \
|
||||
/etc /var/{log,mail,spool} /srv /boot \
|
||||
/usr/local/etc $EXTRA \
|
||||
-x "/srv/backup/*"
|
||||
-x "/srv/backup/*" -x "/srv/sftp/*"
|
||||
status="$?"
|
||||
|
||||
if [[ "$status" != 0 ]]; then
|
||||
|
||||
@@ -28,7 +28,7 @@ function usage() {
|
||||
# Parameters:
|
||||
# 1) The exit status to use.
|
||||
status=$1
|
||||
echo "Usage: $PROG [-s SIZE] [-l LOCATION] [-A | [-r] [-f] [-d] [-c]] [-h] [-x]" >&2
|
||||
echo "Usage: $PROG [-s SIZE] [-l LOCATION] [-A | [-r] [-f] [-d] [-c]] [-h] [-x] [-t]" >&2
|
||||
cat <<- EOF
|
||||
Compress JPG or PNG image(s). Can handle folders and work recursively.
|
||||
|
||||
@@ -45,13 +45,14 @@ function usage() {
|
||||
-A : Resursively Force, Delete, and Clean.
|
||||
-h : Display this usage text.
|
||||
-x : Enable BASH debugging.
|
||||
-t : Format timestamp.
|
||||
EOF
|
||||
exit $status
|
||||
}
|
||||
|
||||
## Parameters ##
|
||||
|
||||
while getopts ":s:l:rfFdcAhx" opt; do
|
||||
while getopts ":s:l:rfFdcAhxt" opt; do
|
||||
case $opt in
|
||||
s) in_size="$OPTARG" && size="$in_size" ;;
|
||||
l) location="$OPTARG" ;;
|
||||
@@ -64,6 +65,7 @@ while getopts ":s:l:rfFdcAhx" opt; do
|
||||
A) recurse="Y" && search="find" && force="Y" && delete="Y" && expand="Y" ;;
|
||||
h) usage 0 ;;
|
||||
x) set -x ;;
|
||||
t) format_time="Y" ;;
|
||||
*) echo "ERROR: Option $OPTARG not recognized." >&2 && usage 1 ;;
|
||||
esac
|
||||
done
|
||||
@@ -130,7 +132,9 @@ $search "$location" | sort | while read image; do
|
||||
# Date Data
|
||||
new_image_exp="${TEMP:0:4}-${TEMP:4:2}-${TEMP:6:2}"
|
||||
# Time Data
|
||||
new_image_exp="${new_image_exp}_${TEMP:8:2}-${TEMP:10:2}-${TEMP:12:2}"
|
||||
if [[ "$format_time" == "Y" ]]; then
|
||||
new_image_exp="${new_image_exp}_${TEMP:8:2}-${TEMP:10:2}-${TEMP:12:2}"
|
||||
fi
|
||||
# Remainder Data
|
||||
if [[ "${TEMP:14:1}" == "." ]]; then
|
||||
SEP=""
|
||||
|
||||
@@ -145,7 +145,50 @@
|
||||
fi
|
||||
curl "https://wttr.in/${1//\ /+}"
|
||||
}
|
||||
export_PS1: export PS1='[\u@\h \w]\$ '
|
||||
export_PS1: |
|
||||
## Prompts ##
|
||||
|
||||
# Old Trusty
|
||||
#export PS1='[\u@\h \w]\$ '
|
||||
|
||||
# 20251201 - Add time.
|
||||
#export PS1='[\t \u@\h \w]\$ '
|
||||
|
||||
# 20251201 - Add colors.
|
||||
# This helps to determine the color palette numbers:
|
||||
# https://robotmoon.com/bash-prompt-generator/
|
||||
PURPLE=`tput setaf 5`
|
||||
ORANGE=`tput setaf 214`
|
||||
GREEN=`tput setaf 2`
|
||||
|
||||
RED=`tput setaf 9`
|
||||
SCARLET=`tput setaf 1`
|
||||
YELLOW=`tput setaf 226` # 11 does not seem to work
|
||||
|
||||
GRAY=`tput setaf 8`
|
||||
|
||||
RESET=`tput sgr0`
|
||||
BOLD=`tput bold`
|
||||
|
||||
if [[ "$USER" == "root" || $UID == 0 ]]; then
|
||||
CLR_BRACKETS=$BOLD$YELLOW
|
||||
CLR_TIME=$BOLD$ORANGE
|
||||
CLR_USER=$BOLD$SCARLET
|
||||
CLR_DIR=$BOLD$RED
|
||||
CLR_PROMPT=$BOLD$GRAY
|
||||
else
|
||||
CLR_BRACKETS=$RESET
|
||||
CLR_TIME=$BOLD$PURPLE
|
||||
CLR_USER=$BOLD$ORANGE
|
||||
CLR_DIR=$BOLD$GREEN
|
||||
CLR_PROMPT=$RESET
|
||||
fi
|
||||
|
||||
export PS1='\[$CLR_BRACKETS\][\[$CLR_TIME\]\t \[$CLR_USER\]\u@\h \[$CLR_DIR\]\w\[$CLR_BRACKETS\]]\[$CLR_PROMPT\]\$ \[$RESET\]'
|
||||
|
||||
export PS2='\[$CLR_BRACKETS\](\[$CLR_TIME\]>\[$CLR_USER\]^\[$CLR_DIR\].\[$CLR_USER\]^\[$CLR_BRACKETS\])\[$CLR_TIME\]> \[$RESET\]'
|
||||
|
||||
## End Prompts ##
|
||||
alias_remount: |
|
||||
alias remount='
|
||||
sudo umount /mnt/*
|
||||
@@ -957,7 +1000,7 @@
|
||||
|
||||
if [[ "$rcvr" == "main" ]]; then
|
||||
echo "*** ERROR: Are you nuts, fool!? Not main! Do it manually! ***"
|
||||
exit 1
|
||||
return 1
|
||||
fi
|
||||
|
||||
if [[ -z "$base" ]]; then
|
||||
@@ -967,7 +1010,7 @@
|
||||
base="dev"
|
||||
else
|
||||
echo "* Unsure which branch to use for '$rcvr'. Please specify."
|
||||
exit 1
|
||||
return 1
|
||||
fi
|
||||
echo "* Base was not specified, using '$base' for '$rcvr'."
|
||||
else
|
||||
@@ -1011,6 +1054,18 @@
|
||||
alias reset-prod="load-branch prod main"
|
||||
alias reset-stage="load-branch stage main"
|
||||
alias reset-dev="load-branch dev main"
|
||||
function check-code-branches {
|
||||
for dir in ~/Code/*/; do
|
||||
cd $dir
|
||||
pwd
|
||||
git ls-remote --heads
|
||||
echo " "
|
||||
cd ..
|
||||
done
|
||||
}
|
||||
alias check-branches="check-code-branches"
|
||||
alias check-branch="git ls-remote --heads"
|
||||
alias branch-check="check-branch"
|
||||
alias_reload_bash: |
|
||||
alias reload-bash="source ~/.bashrc"
|
||||
alias bash-reload="reload-bash"
|
||||
@@ -1051,6 +1106,15 @@
|
||||
status="$?"
|
||||
return "$status"
|
||||
}
|
||||
function_loop: |
|
||||
function loop {
|
||||
cmd="$1"
|
||||
while true; do
|
||||
$cmd
|
||||
done;
|
||||
}
|
||||
alias try="loop "
|
||||
|
||||
|
||||
- name: General | Account Management | Users | Files | Common Variable
|
||||
set_fact:
|
||||
@@ -1134,6 +1198,7 @@
|
||||
{{ alias_docker_other }}
|
||||
{{ alias_flatpak_clean }}
|
||||
{{ alias_commit }}
|
||||
{{ function_loop }}
|
||||
|
||||
- name: General | Account Management | Users | Files | .bashrc
|
||||
blockinfile:
|
||||
|
||||
@@ -40,6 +40,7 @@
|
||||
- "{{ evolution }}*"
|
||||
- gparted
|
||||
- hugo
|
||||
- wireless-tools
|
||||
state: present
|
||||
|
||||
- name: Workstation | Linux | Software | Packages | GS Connect (KDE Connect, Android Tool)
|
||||
|
||||
Reference in New Issue
Block a user