diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index e316c4c..fbff10d 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,22 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Base V 1.1.1 - A. GIBERT - 2026/04/10 +------------------------------------------------------------------------------------------------------------------------------------ + +- Rx3 Profile: + - Add global & opt dir in global vars, + - Add XDG_DATA_DIRS, HISTSIZE, HISTFILESIZE & _JAVA_OPTIONS variables, +- Base library: + - Add "-o errexit -o pipefail -o nounset -O extglob" for bash call in sh_exec(), + - Prefix program name in cmd_exec() & sh_exec() verbose log, +- ISL: + - Add RX3_LIB_DIR env variable support, + - Fix variable quoting bug, +- URPMI-Setup: + - Add RX3_LIB_DIR env variable support, + - Fix a bug in media naming loop. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Base V 1.1.0 - A. GIBERT - 2026/04/09 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/SPECS/rx3-base.spec b/SPECS/rx3-base.spec index ca99402..bc2ff95 100644 --- a/SPECS/rx3-base.spec +++ b/SPECS/rx3-base.spec @@ -25,7 +25,7 @@ %define name rx3-base -%define version 1.1.0 +%define version 1.1.1 %define release %mkrel 1rx3 @@ -131,7 +131,10 @@ cp sbin/* %{buildroot}%{_sbindir} #----------------------------------------------------------------------------------------------------------------------------------- %changelog -* Tue Apr 7 2026 Arnaud G. GIBERT - 1.1.0-1rx3.mga9 +* Fri Apr 10 2026 Arnaud G. GIBERT - 1.1.1-1rx3.mga9 +- Update to 1.1.1 + +* Thu Apr 9 2026 Arnaud G. GIBERT - 1.1.0-1rx3.mga9 - Update to 1.1.0 * Tue Mar 17 2026 Arnaud G. GIBERT - 1.0.0-1rx3.mga9 diff --git a/etc/profile.d/rx3.sh b/etc/profile.d/rx3.sh index 527c01b..969ae00 100644 --- a/etc/profile.d/rx3.sh +++ b/etc/profile.d/rx3.sh @@ -27,9 +27,18 @@ # Global Variable #----------------------------------------------------------------------------------------------------------------------------------- -export PAGER=less -export MANPAGER="less -isr" -export EDITOR=emacs +export MANPATH=$MANPATH:/usr/local/share/man:/usr/global/share/man:/opt/share/man +export CLASSPATH=$CLASSPATH:/usr/local/lib/java:/usr/global/lib/java:/usr/global/lib/java +export XDG_DATA_DIRS=$XDG_DATA_DIRS:/usr/share:/usr/local/share:/usr/global/share:/opt/share + +export HISTSIZE=10000 +export HISTFILESIZE=5000 + +export PAGER=less +export MANPAGER="less -isr" +export EDITOR=emacs +#export GIT_ASKPASS='/usr/bin/ksshaskpass' +export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=gasp' @@ -100,3 +109,4 @@ export -f file_enable alias ll="ls -la" alias em="emacs" +alias xw="startx" diff --git a/sbin/isl b/sbin/isl index dd91a39..0490386 100755 --- a/sbin/isl +++ b/sbin/isl @@ -28,7 +28,8 @@ # Includes #----------------------------------------------------------------------------------------------------------------------------------- -. /usr/lib/rx3/base.bash +: "${RX3_LIB_DIR:=/usr/lib/rx3}" +. "${RX3_LIB_DIR}/base.bash" @@ -38,7 +39,7 @@ # Global Variables #----------------------------------------------------------------------------------------------------------------------------------- -declare -g VERSION="1.1.0" +declare -g VERSION="1.1.1" declare -g NAME="ISL" declare -g HELP="usage: isl [-a | --add ] | [-c | --cat [-r | --reverse]] | [-d | --dump [-i | --inline] [-r | --reverse]] | [-t | --top [-m | --image]] | [[-h | --help] | [-V | --version] [-T | --test] [-v | --verbose]" @@ -210,20 +211,20 @@ isl_add() ts=$(date -u +"%Y/%m/%d %H:%M:%S") - if [[ ! -e ${ISL_FILE} ]] + if [[ ! -e "${ISL_FILE}" ]] then id=1 else - id=$(( $(wc -l <${ISL_FILE}) + 1)) + id=$(( $(wc -l <"${ISL_FILE}") + 1)) fi str="${id} ${ts} ${reg} ${name} ${tag}" if [[ $id == "1" ]] then - sh_exec 'echo "${str}" >${ISL_FILE}' + sh_exec "echo \"${str}\" > \"${ISL_FILE}\"" else - cmd_exec sed -i '1i\'"${str}" ${ISL_FILE} + cmd_exec sed -i '1i\'"${str}" "${ISL_FILE}" fi } @@ -242,9 +243,9 @@ isl_cat() if [[ "${reverse}" == "TRUE" ]] then - cmd_exec tac ${ISL_FILE} + cmd_exec tac "${ISL_FILE}" else - cmd_exec cat ${ISL_FILE} + cmd_exec cat "${ISL_FILE}" fi } @@ -310,7 +311,7 @@ isl_top() local line="" - line=$( head -1 ${ISL_FILE}) + line=$( head -1 "${ISL_FILE}") if [[ "$?" != "0" ]] then @@ -373,7 +374,7 @@ case "${MODE}" in ;; "DUMP") - isl_dump "${REVERSE}" "${INLINE}" + isl_html_dump "${REVERSE}" "${INLINE}" ;; "TOP") diff --git a/sbin/urpmi-setup b/sbin/urpmi-setup index 549d77b..5c6278e 100755 --- a/sbin/urpmi-setup +++ b/sbin/urpmi-setup @@ -28,7 +28,8 @@ # Includes #----------------------------------------------------------------------------------------------------------------------------------- -. /usr/lib/rx3/base.bash +: "${RX3_LIB_DIR:=/usr/lib/rx3}" +. "${RX3_LIB_DIR}/base.bash" @@ -38,7 +39,7 @@ # Global Variables #----------------------------------------------------------------------------------------------------------------------------------- -declare -g VERSION="1.0.0" +declare -g VERSION="1.0.1" declare -g NAME="URPMI Setup" declare -g HELP="usage: urpmi-setup [ [-d | --distrib ] [-m | --mirror-mga ] [-r | --mirror-rx3 ] ] | [-h | --help] | [-V | --version] [-T | --test] [-u | --update] [-v | --verbose]" @@ -182,7 +183,7 @@ do do for type in "Release" "Updates" do - cmd_exec urpmi.update --no-ignore "${media}" "${arch}${type}" + cmd_exec urpmi.update --no-ignore "${media} ${arch}${type}" done done done diff --git a/usr/lib/rx3/base.bash b/usr/lib/rx3/base.bash index fd21a77..d04dc9e 100644 --- a/usr/lib/rx3/base.bash +++ b/usr/lib/rx3/base.bash @@ -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 }