Everbrent/cis
8
0
Fork 0
mirror of https://github.com/m8tin/cis.git synced 2026-08-01 11:47:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Better Layout of messages

Browse Source
This commit is contained in:
m8in
2026-06-22 01:55:40 +02:00
parent 7ff568de1d
commit 8044d776d8
3 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/base.module.sh
+11 -7
View File
@@ -216,17 +216,21 @@ function base.abort() {
&& exit 1 && exit 1
[ "${1:+isset}" != "isset" ] \ [ "${1:+isset}" != "isset" ] \
&& base.printWithColor LIGHTRED "\nScript ${CIS[SCRIPTNAME]} aborted!\n\n" >&2 \ && base.printWithColor LIGHTRED "\nABORT (" >&2 \
&& base.printWithColor WHITE " ${CIS[SCRIPTNAME]}" >&2 \
&& base.printWithColor LIGHTRED ")!\n\n" >&2 \
&& exit 1 && exit 1
[ "${2:+isset}" != "isset" ] \ [ "${2:+isset}" != "isset" ] \
&& base.printWithColor LIGHTRED "\nScript ${CIS[SCRIPTNAME]} aborted!\n" >&2 \ && base.printWithColor LIGHTRED "\nABORT (" >&2 \
&& base.printWithColor WHITE "${1:?"Missing parameter MESSAGE."}\n\n" >&2 \ && base.printWithColor WHITE "${CIS[SCRIPTNAME]}" >&2 \
&& base.printWithColor LIGHTRED "): ${1:?"Missing parameter MESSAGE."}\n\n" >&2 \
&& exit 1 && exit 1
base.printWithColor LIGHTRED "\nScript ${CIS[SCRIPTNAME]} aborted!\n" >&2 base.printWithColor LIGHTRED "\nABORT (" >&2
base.printWithColor WHITE "${1:?"Missing parameter MESSAGE."}\n" >&2 base.printWithColor WHITE "${CIS[SCRIPTNAME]}" >&2
base.printWithColor CYAN "TIP: ${2:?"Missing parameter TIP."}:\n" >&2 base.printWithColor LIGHTRED "): ${1:?"Missing parameter MESSAGE."}\n" >&2
base.printWithColor YELLOW "Reason: ${2:?"Missing parameter REASON."}\n" >&2
while [ -n "${3}" ]; do while [ -n "${3}" ]; do
base.printWithColor LIGHTGREY " ${3:-""}\n" >&2 base.printWithColor LIGHTGREY " ${3:-""}\n" >&2
shift shift
@@ -460,7 +464,7 @@ elif [ "${CIS[SET]}" == "ready" ]; then
base.abort "Module '${BASH_SOURCE[0]}' already loaded." base.abort "Module '${BASH_SOURCE[0]}' already loaded."
else else
# If not exists, define a global array 'COLOR' # If not exists, define a global array 'COLOR'
trap "base.abort ' User-initiated termination.'" INT \ trap "base.abort 'User-initiated termination.'" INT \
&& declare -A -g COLOR=([SET]=unprepared) \ && declare -A -g COLOR=([SET]=unprepared) \
&& prepare.setCOLOR \ && prepare.setCOLOR \
&& prepare.setPATH "/bin/grep" \ && prepare.setPATH "/bin/grep" \
module/print.module.sh
+10 -10
View File
@@ -67,25 +67,25 @@ function print.fail() {
#Function, for failures. #Function, for failures.
function print.failure() { function print.failure() {
[ "${1:+isset}" != "isset" ] \ [ "${1:+isset}" != "isset" ] \
&& base.printWithColor LIGHTRED "\nFAILURE:" >&2 \ && base.printWithColor LIGHTRED "FAILURE (" >&2 \
&& base.printWithColor WHITE " ${CIS[SCRIPTNAME]}\n\n" >&2 \ && base.printWithColor WHITE " ${CIS[SCRIPTNAME]}" >&2 \
&& base.printWithColor LIGHTRED ")!\n" >&2 \
&& return 0 && return 0
[ "${2:+isset}" != "isset" ] \ [ "${2:+isset}" != "isset" ] \
&& base.printWithColor LIGHTRED "\nFAILURE:" >&2 \ && base.printWithColor LIGHTRED "FAILURE (" >&2 \
&& base.printWithColor WHITE " ${CIS[SCRIPTNAME]}\n" >&2 \ && base.printWithColor WHITE "${CIS[SCRIPTNAME]}" >&2 \
&& base.printWithColor WHITE " ${1:?"Missing parameter MESSAGE."}\n\n" >&2 \ && base.printWithColor LIGHTRED "): ${1:?"Missing parameter MESSAGE."}\n" >&2 \
&& return 0 && return 0
base.printWithColor LIGHTRED "\nFAILURE:" >&2 base.printWithColor LIGHTRED "FAILURE (" >&2
base.printWithColor WHITE " ${CIS[SCRIPTNAME]}\n" >&2 base.printWithColor WHITE "${CIS[SCRIPTNAME]}" >&2
base.printWithColor WHITE " ${1:?"Missing parameter MESSAGE."}\n" >&2 base.printWithColor LIGHTRED "): ${1:?"Missing parameter MESSAGE."}\n" >&2
base.printWithColor CYAN "TIP: ${2:?"Missing parameter TIP."}:\n" >&2 base.printWithColor CYAN "TIP: ${2:?"Missing parameter TIP."}\n" >&2
while [ -n "${3}" ]; do while [ -n "${3}" ]; do
base.printWithColor LIGHTGREY " ${3:-""}\n" >&2 base.printWithColor LIGHTGREY " ${3:-""}\n" >&2
shift shift
done done
echo >&2
return 0 return 0
} }
script/host/zfs/composition-sync/sync-send.sh
+2 -1
View File
@@ -139,7 +139,8 @@ base.set RECEIVERS_SNAPSHOT "${4}" "${REGEX[SNAPSHOT]}" optional
base.set RESUME_TOKEN "${5}" '^[a-zA-Z0-9][a-zA-Z0-9._:-]*$' optional base.set RESUME_TOKEN "${5}" '^[a-zA-Z0-9][a-zA-Z0-9._:-]*$' optional
! composition.shouldBeSyncedByGivenHost "${COMPOSITION}" "${RECEIVERHOST}" \ ! composition.shouldBeSyncedByGivenHost "${COMPOSITION}" "${RECEIVERHOST}" \
&& base.abort "The host '${RECEIVERHOST}' is no sync-host for composition: '${COMPOSITION}'" && base.abort "no sync-host available" \
"Host '${RECEIVERHOST}' is no sync-host for composition: '${COMPOSITION}'"
# Resume mode # Resume mode
if [ "${RECEIVERS_SNAPSHOT}" == "@RESUME" ] && [ -n "${RESUME_TOKEN}" ]; then if [ "${RECEIVERS_SNAPSHOT}" == "@RESUME" ] && [ -n "${RESUME_TOKEN}" ]; then