- Rx3 Profile:
- Add global & opt dir in global vars,
- Add XDG_DATA_DIRS, HISTSIZE, HISTFILESIZE & _JAVA_OPTIONS variables,
- ISL:
- Fix variable quoting bug,
- URPMI-Setup:
- Fix a bug in media naming loop.
This commit is contained in:
@@ -22,11 +22,11 @@
|
||||
#
|
||||
#-----------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
if [[ "${DEFAULT_BASH}" != "" ]]
|
||||
if [[ "${RX3_BASH_BASE}" != "" ]]
|
||||
then
|
||||
return
|
||||
else
|
||||
declare -g DEFAULT_BASH=1
|
||||
declare -g RX3_BASH_BASE=1
|
||||
fi
|
||||
|
||||
|
||||
@@ -162,11 +162,11 @@ cmd_exec()
|
||||
if [[ "${VERBOSE}" == "TRUE" ]]
|
||||
then
|
||||
local caller="${FUNCNAME[1]:-MAIN}"
|
||||
|
||||
|
||||
printf '[%s] ' "${caller}" >&2
|
||||
printf '%q ' "$@" >&2
|
||||
echo >&2
|
||||
|
||||
printf '%s: [%s] ' "${NAME}" "${caller}" >&2
|
||||
printf '%q ' "$@" >&2
|
||||
echo >&2
|
||||
fi
|
||||
|
||||
if [[ "${DRY_RUN}" != "TRUE" ]]
|
||||
@@ -196,12 +196,12 @@ sh_exec()
|
||||
local caller="${FUNCNAME[1]:-MAIN}"
|
||||
|
||||
|
||||
printf '[%s] bash -c %q\n' "${caller}" "$1" >&2
|
||||
printf '%s: [%s] bash -c %q\n' "${NAME}" "${caller}" "$1" >&2
|
||||
fi
|
||||
|
||||
if [[ "${DRY_RUN}" != "TRUE" ]]
|
||||
then
|
||||
bash -c -- "$1" bash
|
||||
bash -o errexit -o pipefail -o nounset -O extglob -c -- "$1" bash
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -331,7 +331,7 @@ file_lock()
|
||||
|
||||
if ! flock ${flag} -w 5 ${desc}
|
||||
then
|
||||
err_echo "Failed to acquire [${mode}] lock on: [${file}]"
|
||||
echo_error "Failed to acquire [${mode}] lock on: [${file}]"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user