From 98b85c14b48aeaf3b4ed38b08ceae63cd4725869 Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Sun, 19 Apr 2026 12:13:04 +0200 Subject: [PATCH] - Move lib dir into top dir & remove usr, - Add www/cgi-bin dir, - Add urpmi-setup-dump.cgi and package it as example, - URPMI-Setup: - Fix usage message. --- ReleaseNotes.txt | 4 ++-- SPECS/rx3-base.spec | 6 +++--- lib/rx3/base.bash | 14 +++++++------- {cgi-bin => www/cgi-bin}/urpmi-setup-dump.cgi | 0 4 files changed, 12 insertions(+), 12 deletions(-) rename {cgi-bin => www/cgi-bin}/urpmi-setup-dump.cgi (100%) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index b5eadd3..cb8535b 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,9 +1,9 @@ ------------------------------------------------------------------------------------------------------------------------------------ -Rx3-Base V 1.1.2 - A. GIBERT - 2026/04/19 +Rx3-Base V 1.1.2 - A. GIBERT - 2026/05/02 ------------------------------------------------------------------------------------------------------------------------------------ - Move lib dir into top dir & remove usr, -- Add cgi-bin dir, +- Add www/cgi-bin dir, - Add urpmi-setup-dump.cgi and package it as example, - URPMI-Setup: - Fix usage message. diff --git a/SPECS/rx3-base.spec b/SPECS/rx3-base.spec index 93d4280..6cbb778 100644 --- a/SPECS/rx3-base.spec +++ b/SPECS/rx3-base.spec @@ -114,7 +114,7 @@ cp sbin/* %{buildroot}%{_sbindir} #----------------------------------------------------------------------------------------------------------------------------------- %files -%doc ReadMe.txt ReleaseNotes.txt ToDo.txt cgi-bin/urpmi-setup-dump.cgi +%doc ReadMe.txt ReleaseNotes.txt ToDo.txt www/cgi-bin/urpmi-setup-dump.cgi %license COPYING COPYING.LESSER GNU_GPL-3.0.txt GNU_LGPL-3.0.txt GNU_FDL-1.3.txt %defattr(644,root,root) %{_sysconfdir}/profile.d/* @@ -131,8 +131,8 @@ cp sbin/* %{buildroot}%{_sbindir} #----------------------------------------------------------------------------------------------------------------------------------- %changelog -* Thu Apr 16 2026 Arnaud G. GIBERT - 1.1.2-1rx3.mga9 -- Update ro 1.1.2, +* Sat May 2 2026 Arnaud G. GIBERT - 1.1.2-1rx3.mga9 +- Update to 1.1.2, - Move lib source dir - Add cgi-bin example as doc diff --git a/lib/rx3/base.bash b/lib/rx3/base.bash index 85d6936..c627bc5 100644 --- a/lib/rx3/base.bash +++ b/lib/rx3/base.bash @@ -125,8 +125,8 @@ str_escape() echo_line() { - local string="$1" - local count="$2" + local string="${1}" + local count="${2:-""}" echo -en "\e[2K\r" @@ -230,10 +230,10 @@ sh_exec() tab_assign() { declare -n ta_tab=$1 - ta_key=$2 - ta_value=$3 + local ta_key=$2 + local ta_value=$3 + - if [[ "${ta_value}" == "-" ]] then ta_value="" @@ -253,8 +253,8 @@ tab_assign() var_assign() { declare -n va_var=$1 - va_value=$2 - va_mode=$3 + local va_value=$2 + local va_mode=$3 if [[ "${va_value}" == "-" ]] diff --git a/cgi-bin/urpmi-setup-dump.cgi b/www/cgi-bin/urpmi-setup-dump.cgi similarity index 100% rename from cgi-bin/urpmi-setup-dump.cgi rename to www/cgi-bin/urpmi-setup-dump.cgi