From 99e8f42a6d1415f68fe087d841415fdabf2c2a46 Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Wed, 9 Sep 2026 20:24:54 +0200 Subject: [PATCH] - Base library: - Implement VSL (Version Stack Log), - ISL: - Add VSL support, - URPMI-Setup - Add VSL support. --- ReadMe.txt | 2 +- ReleaseNotes.txt | 13 +++++ SPECS/rx3-base.spec | 5 +- lib/rx3/base.bash | 123 +++++++++++++++++++++++++++++++++++++++----- sbin/isl | 8 +-- sbin/urpmi-setup | 10 ++-- 6 files changed, 140 insertions(+), 21 deletions(-) diff --git a/ReadMe.txt b/ReadMe.txt index d55f0ed..9f8c439 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -1,4 +1,4 @@ -Welcome to Rx3 Base 1.1.x ! +Welcome to Rx3 Base 1.2.x ! diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 28ac154..4978fab 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,16 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Base V 1.2.0 - A. GIBERT - 2026/09/09 +------------------------------------------------------------------------------------------------------------------------------------ + +- Base library: + - Implement VSL (Version Stack Log), +- ISL: + - Add VSL support, +- URPMI-Setup + - Add VSL support. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Base V 1.1.3 - A. GIBERT - 2026/08/01 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/SPECS/rx3-base.spec b/SPECS/rx3-base.spec index c38684c..567ca4d 100644 --- a/SPECS/rx3-base.spec +++ b/SPECS/rx3-base.spec @@ -25,7 +25,7 @@ %define name rx3-base -%define version 1.1.3 +%define version 1.2.0 %define release %mkrel 1rx3 @@ -178,6 +178,9 @@ cp sbin/* %{buildroot}%{_sbindir} #----------------------------------------------------------------------------------------------------------------------------------- %changelog +* Wed Sep 9 2026 Arnaud G. GIBERT - 1.2.0-1rx3.mga9 +- Update to 1.2.0 + * Sat Aug 1 2026 Arnaud G. GIBERT - 1.1.3-1rx3.mga9 - Update to 1.1.3 diff --git a/lib/rx3/base.bash b/lib/rx3/base.bash index 5ebda40..23b9674 100644 --- a/lib/rx3/base.bash +++ b/lib/rx3/base.bash @@ -46,18 +46,86 @@ shopt -s extglob # Global Variable #----------------------------------------------------------------------------------------------------------------------------------- -declare -g NAME="" -declare -g VERSION="" +declare -g RX3_LIB_VSL=() -declare -g DUMP="FALSE" -declare -g DRY_RUN="FALSE" -declare -g HELP="" -declare -g VERBOSE="FALSE" +declare RX3_LIB_NAME="Base" +declare RX3_LIB_VERSION="1.2.0" -declare -g LOG_FILE="" -declare -g LOG_LOCK="" -declare -g LOG_ECHO="" -declare -g LOG_TRACE="DISABLED" +declare -g NAME="" +declare -g VERSION="" + +declare -g DUMP="FALSE" +declare -g DRY_RUN="FALSE" +declare -g HELP="" +declare -g VERBOSE="FALSE" + +declare -g LOG_FILE="" +declare -g LOG_LOCK="" +declare -g LOG_ECHO="" +declare -g LOG_TRACE="DISABLED" + + + + + +#-------------------------------------------------------------------------------------------------------------------------- +# VSL Add +#-------------------------------------------------------------------------------------------------------------------------- + +vsl_add() +{ + local name + local version + local file + + + if [[ "${BASH_SOURCE[1]}" == "$0" ]] + then + name="${NAME}" + version="${VERSION}" + file="${0}" + else + name="${RX3_LIB_NAME}" + version="${RX3_LIB_VERSION}" + file="${BASH_SOURCE[1]}" + fi + + RX3_LIB_VSL=("${name} ${version} ${file}" "${RX3_LIB_VSL[@]}") +} + + + + + +#-------------------------------------------------------------------------------------------------------------------------- +# VSL Cat +#-------------------------------------------------------------------------------------------------------------------------- + +vsl_cat() +{ + local reverse="$1" + + + if [[ "${reverse}" == "TRUE" ]] + then + printf '%s\n' "${RX3_LIB_VSL[@]}" | tac + else + printf '%s\n' "${RX3_LIB_VSL[@]}" + fi +} + + + + + +#-------------------------------------------------------------------------------------------------------------------------- +# VSL Top +#-------------------------------------------------------------------------------------------------------------------------- + +vsl_top() +{ + printf '%s\n' "${RX3_LIB_VSL[@]}" | head -1 +} @@ -69,8 +137,29 @@ declare -g LOG_TRACE="DISABLED" version_print() { -# echo "${VERSION}" | sed -e 's/.*: //' -e 's/-/ /' -e 's/_/\./g' -e 's/\$$//' - echo "${NAME} V${VERSION}" + local full="${1}" + + + ( + if [[ "${full}" == "TRUE" ]] + then + vsl_cat "" + else + vsl_top + fi + ) | while read line + do + set ${line} + + str="${1}\tV ${2}" + + if [[ "${VERBOSE}" == "TRUE" ]] + then + str+="\t${3}" + fi + + echo -e ${str} + done } @@ -510,3 +599,13 @@ log_error() { log_print "${LOG_FILE}" "${LOG_LOCK}" "${LOG_ECHO}" "ERR" "$@" } + + + + + +#-------------------------------------------------------------------------------------------------------------------------- +# Main +#-------------------------------------------------------------------------------------------------------------------------- + +vsl_add diff --git a/sbin/isl b/sbin/isl index e60a714..d10f360 100755 --- a/sbin/isl +++ b/sbin/isl @@ -39,7 +39,7 @@ # Global Variables #----------------------------------------------------------------------------------------------------------------------------------- -declare -g VERSION="1.1.1" +declare -g VERSION="1.2.0" declare -g NAME="ISL" declare -g HELP="usage: isl [-a | --add ] | [-c | --cat [-r | --reverse]] | [-H | --html_dump [-i | --inline] [-r | --reverse]] | [-t | --top [-m | --image]] | [[-h | --help] | [-V | --version] [-T | --test] [-v | --verbose]" @@ -136,7 +136,7 @@ function isl_args_parse() isl_version_print() { - version_print + version_print "TRUE" } @@ -149,7 +149,7 @@ isl_version_print() isl_help_print() { - version_print + version_print "" help_print } @@ -335,6 +335,8 @@ isl_top() # Main #----------------------------------------------------------------------------------------------------------------------------------- +vsl_add + orig_args=("$@") isl_args_parse "$@" diff --git a/sbin/urpmi-setup b/sbin/urpmi-setup index f56f987..737469f 100755 --- a/sbin/urpmi-setup +++ b/sbin/urpmi-setup @@ -39,8 +39,8 @@ # Global Variables #----------------------------------------------------------------------------------------------------------------------------------- -declare -g VERSION="1.0.2" -declare -g NAME="URPMI Setup" +declare -g VERSION="1.2.0" +declare -g NAME="URPMI-Setup" declare -g HELP="usage: urpmi-setup [ [-d | --distrib ] [-m | --mirror-mga ] [-r | --mirror-rx3 ] ] | [-h | --help] | [-V | --version] [ [ -D | --dump] | [-T | --test] ] [-u | --update] [-v | --verbose] ) ]" declare -g DISTRIB_DEF="9" @@ -140,7 +140,7 @@ function us_args_parse() us_version_print() { - version_print + version_print "TRUE" } @@ -153,7 +153,7 @@ us_version_print() us_help_print() { - version_print + version_print "" help_print } @@ -165,6 +165,8 @@ us_help_print() # Main #----------------------------------------------------------------------------------------------------------------------------------- +vsl_add + orig_args=("$@") us_args_parse "$@"