Skip to content

Commit 44864a3

Browse files
lj020326lj020326
committed
group updates to public branch
1 parent f8db36c commit 44864a3

File tree

5 files changed

+278
-225
lines changed

5 files changed

+278
-225
lines changed

‎ensure-symlinks.sh‎

Lines changed: 83 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -65,57 +65,114 @@ LOG_INFO=2
6565
LOG_TRACE=3
6666
LOG_DEBUG=4
6767

68+
declare -A LOGLEVEL_TO_STR
69+
LOGLEVEL_TO_STR["${LOG_ERROR}"]="ERROR"
70+
LOGLEVEL_TO_STR["${LOG_WARN}"]="WARN"
71+
LOGLEVEL_TO_STR["${LOG_INFO}"]="INFO"
72+
LOGLEVEL_TO_STR["${LOG_TRACE}"]="TRACE"
73+
LOGLEVEL_TO_STR["${LOG_DEBUG}"]="DEBUG"
74+
75+
function reverse_array() {
76+
local -n ARRAY_SOURCE_REF=$1
77+
local -n REVERSED_ARRAY_REF=$2
78+
# Iterate over the keys of the LOGLEVEL_TO_STR array
79+
for KEY in "${!ARRAY_SOURCE_REF[@]}"; do
80+
# Get the value associated with the current key
81+
VALUE="${ARRAY_SOURCE_REF[$KEY]}"
82+
# Add the reversed key-value pair to the REVERSED_ARRAY_REF array
83+
REVERSED_ARRAY_REF[$VALUE]="$KEY"
84+
done
85+
}
86+
87+
declare -A LOGLEVELSTR_TO_LEVEL
88+
reverse_array LOGLEVEL_TO_STR LOGLEVELSTR_TO_LEVEL
89+
6890
#LOG_LEVEL=${LOG_DEBUG}
6991
LOG_LEVEL=${LOG_INFO}
7092

7193
function logError() {
7294
if [ $LOG_LEVEL -ge $LOG_ERROR ]; then
73-
echo -e "[ERROR]: ${1}"
95+
logMessage "${LOG_ERROR}" "${1}"
7496
fi
7597
}
7698
function logWarn() {
7799
if [ $LOG_LEVEL -ge $LOG_WARN ]; then
78-
echo -e "[WARN ]: ${1}"
100+
logMessage "${LOG_WARN}" "${1}"
79101
fi
80102
}
81103
function logInfo() {
82104
if [ $LOG_LEVEL -ge $LOG_INFO ]; then
83-
echo -e "[INFO ]: ${1}"
105+
logMessage "${LOG_INFO}" "${1}"
84106
fi
85107
}
86108
function logTrace() {
87109
if [ $LOG_LEVEL -ge $LOG_TRACE ]; then
88-
echo -e "[TRACE]: ${1}"
110+
logMessage "${LOG_TRACE}" "${1}"
89111
fi
90112
}
91113
function logDebug() {
92114
if [ $LOG_LEVEL -ge $LOG_DEBUG ]; then
93-
echo -e "[DEBUG]: ${1}"
115+
logMessage "${LOG_DEBUG}" "${1}"
94116
fi
95117
}
118+
function abort() {
119+
logError "$@"
120+
exit 1
121+
}
122+
function fail() {
123+
logError "$@"
124+
exit 1
125+
}
126+
127+
function logMessage() {
128+
local LOG_MESSAGE_LEVEL="${1}"
129+
local LOG_MESSAGE="${2}"
130+
## remove first item from FUNCNAME array
131+
# local CALLING_FUNCTION_ARRAY=("${FUNCNAME[@]:2}")
132+
## Get the length of the array
133+
local CALLING_FUNCTION_ARRAY_LENGTH=${#FUNCNAME[@]}
134+
local CALLING_FUNCTION_ARRAY=("${FUNCNAME[@]:2:$((CALLING_FUNCTION_ARRAY_LENGTH - 3))}")
135+
# echo "CALLING_FUNCTION_ARRAY[@]=${CALLING_FUNCTION_ARRAY[@]}"
136+
137+
local CALL_ARRAY_LENGTH=${#CALLING_FUNCTION_ARRAY[@]}
138+
local REVERSED_CALL_ARRAY=()
139+
for (( i = CALL_ARRAY_LENGTH - 1; i >= 0; i-- )); do
140+
REVERSED_CALL_ARRAY+=( "${CALLING_FUNCTION_ARRAY[i]}" )
141+
done
142+
# echo "REVERSED_CALL_ARRAY[@]=${REVERSED_CALL_ARRAY[@]}"
143+
144+
# local CALLING_FUNCTION_STR="${CALLING_FUNCTION_ARRAY[*]}"
145+
## ref: https://stackoverflow.com/questions/1527049/how-can-i-join-elements-of-a-bash-array-into-a-delimited-string#17841619
146+
local SEPARATOR=":"
147+
local CALLING_FUNCTION_STR
148+
CALLING_FUNCTION_STR=$(printf "${SEPARATOR}%s" "${REVERSED_CALL_ARRAY[@]}")
149+
CALLING_FUNCTION_STR=${CALLING_FUNCTION_STR:${#SEPARATOR}}
150+
151+
## ref: https://stackoverflow.com/a/13221491
152+
if [ "${LOGLEVEL_TO_STR[${LOG_MESSAGE_LEVEL}]+abc}" ]; then
153+
LOG_LEVEL_STR="${LOGLEVEL_TO_STR[${LOG_MESSAGE_LEVEL}]}"
154+
else
155+
abort "Unknown log level of [${LOG_MESSAGE_LEVEL}]"
156+
fi
157+
158+
local LOG_LEVEL_PADDING_LENGTH=5
159+
160+
local PADDED_LOG_LEVEL
161+
PADDED_LOG_LEVEL=$(printf "%-${LOG_LEVEL_PADDING_LENGTH}s" "${LOG_LEVEL_STR}")
162+
163+
local LOG_PREFIX="${CALLING_FUNCTION_STR}():"
164+
echo -e "[${PADDED_LOG_LEVEL}]: ==> ${LOG_PREFIX} ${LOG_MESSAGE}"
165+
}
96166

97167
function setLogLevel() {
98-
local LOGLEVEL=$1
99-
100-
case "${LOGLEVEL}" in
101-
ERROR*)
102-
LOG_LEVEL=$LOG_ERROR
103-
;;
104-
WARN*)
105-
LOG_LEVEL=$LOG_WARN
106-
;;
107-
INFO*)
108-
LOG_LEVEL=$LOG_INFO
109-
;;
110-
TRACE*)
111-
LOG_LEVEL=$LOG_TRACE
112-
;;
113-
DEBUG*)
114-
LOG_LEVEL=$LOG_DEBUG
115-
;;
116-
*)
117-
abort "Unknown loglevel of [${LOGLEVEL}] specified"
118-
esac
168+
LOG_LEVEL_STR=$1
169+
170+
## ref: https://stackoverflow.com/a/13221491
171+
if [ "${LOGLEVELSTR_TO_LEVEL[${LOG_LEVEL_STR}]+abc}" ]; then
172+
LOG_LEVEL="${LOGLEVELSTR_TO_LEVEL[${LOG_LEVEL_STR}]}"
173+
else
174+
abort "Unknown log level of [${LOG_LEVEL_STR}]"
175+
fi
119176

120177
}
121178

‎templates/_common/scripts/linux/install_site_cacerts.orig.sh‎

Lines changed: 48 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -109,39 +109,64 @@ LOG_INFO=2
109109
LOG_TRACE=3
110110
LOG_DEBUG=4
111111

112+
declare -A LOGLEVEL_TO_STR
113+
LOGLEVEL_TO_STR["${LOG_ERROR}"]="ERROR"
114+
LOGLEVEL_TO_STR["${LOG_WARN}"]="WARN"
115+
LOGLEVEL_TO_STR["${LOG_INFO}"]="INFO"
116+
LOGLEVEL_TO_STR["${LOG_TRACE}"]="TRACE"
117+
LOGLEVEL_TO_STR["${LOG_DEBUG}"]="DEBUG"
118+
119+
function reverse_array() {
120+
local -n ARRAY_SOURCE_REF=$1
121+
local -n REVERSED_ARRAY_REF=$2
122+
# Iterate over the keys of the LOGLEVEL_TO_STR array
123+
for KEY in "${!ARRAY_SOURCE_REF[@]}"; do
124+
# Get the value associated with the current key
125+
VALUE="${ARRAY_SOURCE_REF[$KEY]}"
126+
# Add the reversed key-value pair to the REVERSED_ARRAY_REF array
127+
REVERSED_ARRAY_REF[$VALUE]="$KEY"
128+
done
129+
}
130+
131+
declare -A LOGLEVELSTR_TO_LEVEL
132+
reverse_array LOGLEVEL_TO_STR LOGLEVELSTR_TO_LEVEL
133+
112134
#LOG_LEVEL=${LOG_DEBUG}
113135
LOG_LEVEL=${LOG_INFO}
114136

115137
function logError() {
116138
if [ $LOG_LEVEL -ge $LOG_ERROR ]; then
117-
# echo -e "[ERROR]: ==> ${1}"
118139
logMessage "${LOG_ERROR}" "${1}"
119140
fi
120141
}
121142
function logWarn() {
122143
if [ $LOG_LEVEL -ge $LOG_WARN ]; then
123-
# echo -e "[WARN ]: ==> ${1}"
124144
logMessage "${LOG_WARN}" "${1}"
125145
fi
126146
}
127147
function logInfo() {
128148
if [ $LOG_LEVEL -ge $LOG_INFO ]; then
129-
# echo -e "[INFO ]: ==> ${1}"
130149
logMessage "${LOG_INFO}" "${1}"
131150
fi
132151
}
133152
function logTrace() {
134153
if [ $LOG_LEVEL -ge $LOG_TRACE ]; then
135-
# echo -e "[TRACE]: ==> ${1}"
136154
logMessage "${LOG_TRACE}" "${1}"
137155
fi
138156
}
139157
function logDebug() {
140158
if [ $LOG_LEVEL -ge $LOG_DEBUG ]; then
141-
# echo -e "[DEBUG]: ==> ${1}"
142159
logMessage "${LOG_DEBUG}" "${1}"
143160
fi
144161
}
162+
function abort() {
163+
logError "$@"
164+
exit 1
165+
}
166+
function fail() {
167+
logError "$@"
168+
exit 1
169+
}
145170

146171
function logMessage() {
147172
local LOG_MESSAGE_LEVEL="${1}"
@@ -163,31 +188,21 @@ function logMessage() {
163188
# local CALLING_FUNCTION_STR="${CALLING_FUNCTION_ARRAY[*]}"
164189
## ref: https://stackoverflow.com/questions/1527049/how-can-i-join-elements-of-a-bash-array-into-a-delimited-string#17841619
165190
local SEPARATOR=":"
166-
local CALLING_FUNCTION_STR=$(printf "${SEPARATOR}%s" "${REVERSED_CALL_ARRAY[@]}")
167-
local CALLING_FUNCTION_STR=${CALLING_FUNCTION_STR:${#SEPARATOR}}
191+
local CALLING_FUNCTION_STR
192+
CALLING_FUNCTION_STR=$(printf "${SEPARATOR}%s" "${REVERSED_CALL_ARRAY[@]}")
193+
CALLING_FUNCTION_STR=${CALLING_FUNCTION_STR:${#SEPARATOR}}
168194

169-
case "${LOG_MESSAGE_LEVEL}" in
170-
$LOG_ERROR*)
171-
LOG_LEVEL_STR="ERROR"
172-
;;
173-
$LOG_WARN*)
174-
LOG_LEVEL_STR="WARN"
175-
;;
176-
$LOG_INFO*)
177-
LOG_LEVEL_STR="INFO"
178-
;;
179-
$LOG_TRACE*)
180-
LOG_LEVEL_STR="TRACE"
181-
;;
182-
$LOG_DEBUG*)
183-
LOG_LEVEL_STR="DEBUG"
184-
;;
185-
*)
186-
abort "Unknown LOG_MESSAGE_LEVEL of [${LOG_MESSAGE_LEVEL}] specified"
187-
esac
195+
## ref: https://stackoverflow.com/a/13221491
196+
if [ "${LOGLEVEL_TO_STR[${LOG_MESSAGE_LEVEL}]+abc}" ]; then
197+
LOG_LEVEL_STR="${LOGLEVEL_TO_STR[${LOG_MESSAGE_LEVEL}]}"
198+
else
199+
abort "Unknown log level of [${LOG_MESSAGE_LEVEL}]"
200+
fi
188201

189202
local LOG_LEVEL_PADDING_LENGTH=5
190-
local PADDED_LOG_LEVEL=$(printf "%-${LOG_LEVEL_PADDING_LENGTH}s" "${LOG_LEVEL_STR}")
203+
204+
local PADDED_LOG_LEVEL
205+
PADDED_LOG_LEVEL=$(printf "%-${LOG_LEVEL_PADDING_LENGTH}s" "${LOG_LEVEL_STR}")
191206

192207
local LOG_PREFIX="${CALLING_FUNCTION_STR}():"
193208
echo -e "[${PADDED_LOG_LEVEL}]: ==> ${LOG_PREFIX} ${LOG_MESSAGE}"
@@ -196,25 +211,12 @@ function logMessage() {
196211
function setLogLevel() {
197212
LOG_LEVEL_STR=$1
198213

199-
case "${LOG_LEVEL_STR}" in
200-
ERROR*)
201-
LOG_LEVEL=$LOG_ERROR
202-
;;
203-
WARN*)
204-
LOG_LEVEL=$LOG_WARN
205-
;;
206-
INFO*)
207-
LOG_LEVEL=$LOG_INFO
208-
;;
209-
TRACE*)
210-
LOG_LEVEL=$LOG_TRACE
211-
;;
212-
DEBUG*)
213-
LOG_LEVEL=$LOG_DEBUG
214-
;;
215-
*)
216-
abort "Unknown LOG_LEVEL_STR of [${LOG_LEVEL_STR}] specified"
217-
esac
214+
## ref: https://stackoverflow.com/a/13221491
215+
if [ "${LOGLEVELSTR_TO_LEVEL[${LOG_LEVEL_STR}]+abc}" ]; then
216+
LOG_LEVEL="${LOGLEVELSTR_TO_LEVEL[${LOG_LEVEL_STR}]}"
217+
else
218+
abort "Unknown log level of [${LOG_LEVEL_STR}]"
219+
fi
218220

219221
}
220222

0 commit comments

Comments
 (0)