Author SHA1 Message Date
AlkorZ3 895a46e903 - URPMI-Setup:
- Now install Rx3 CA certificate.
2026-10-30 13:55:27 +01:00
AlkorZ3 e9e5697d39 - Fix version_print call in help_print. 2026-09-13 12:06:44 +02:00
AlkorZ3 96e9b5524b - Base library:
- Implement VSL (Version Stack Log),
- ISL:
    - Add VSL support,
- URPMI-Setup
    - Add VSL support.
2026-09-11 20:20:16 +02:00
AlkorZ3 d1f671c128 - Rx3 Profile:
- Add PATH management.
2026-08-01 18:12:18 +02:00
AlkorZ3 e53a87d56a - Base library: Add optionnal "FORCE" flag to cmd_exec & sh_exec functions to overstep Test mode,
- Split between rx3-base, rx3-base-config, rx3-base-libs and rx3-base-tools RPM packages.
2026-05-03 11:27:24 +02:00
AlkorZ3 98b85c14b4 - 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.
2026-05-02 18:28:41 +02:00
AlkorZ3 f0ea953c63 - Fix Complete ReleaseNotes file. 2026-04-19 12:10:14 +02:00
AlkorZ3 d38a486b6e - Mouve lib & sbin out of usr,
- Remove usr dir,
- Add urpmi-setup-dump.cgi.
2026-04-16 19:10:39 +02:00
AlkorZ3 64dd7a911e - Move sbin dir into usr,
- Fix usage message in urpmi-setup.
2026-04-16 14:16:22 +02:00
8 changed files with 458 additions and 97 deletions

No files matched your search

+4 -4
View File
@@ -1,11 +1,11 @@
Welcome to Rx3 Base 1.1.x ! Welcome to Rx3 Base 1.2.x !
This is the base component of an Rx3 system: This is the base component of an Rx3 system:
- Default config files, - Default config file (rx3.sh),
- Base bash libraries, - Base bash library,
- Default tools. - Default tools (isl & urpmi-setup).
+45
View File
@@ -1,3 +1,48 @@
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Base V 1.2.1 - A. GIBERT - 2026/10/30
------------------------------------------------------------------------------------------------------------------------------------
- URPMI-Setup:
- Now install Rx3 CA certificate.
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Base V 1.2.0 - A. GIBERT - 2026/09/13
------------------------------------------------------------------------------------------------------------------------------------
- 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
------------------------------------------------------------------------------------------------------------------------------------
- Rx3 Profile:
- Add PATH management.
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Base V 1.1.2 - A. GIBERT - 2026/05/03
------------------------------------------------------------------------------------------------------------------------------------
- Base library: Add optionnal "FORCE" flag to cmd_exec & sh_exec functions to overstep Test mode,
- Split between rx3-base, rx3-base-config, rx3-base-libs and rx3-base-tools RPM packages,
- 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.
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
Rx3-Base V 1.1.1 - A. GIBERT - 2026/04/10 Rx3-Base V 1.1.1 - A. GIBERT - 2026/04/10
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
+68 -6
View File
@@ -25,7 +25,7 @@
%define name rx3-base %define name rx3-base
%define version 1.1.1 %define version 1.2.1
%define release %mkrel 1rx3 %define release %mkrel 1rx3
@@ -36,11 +36,12 @@
# Package # Package
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
Summary: Rx3 Base Package
Name: %{name} Name: %{name}
Version: %{version} Version: %{version}
Release: %{release} Release: %{release}
Summary: Rx3 Base Meta Package
License: GPL 3.0 License: GPL 3.0
URL: https://git.rx3.org/gitea/rx3/%{name} URL: https://git.rx3.org/gitea/rx3/%{name}
Group: System Group: System
@@ -51,6 +52,10 @@ Packager: Arnaud G. GIBERT <arnaud@rx3.net>
BuildArch: noarch BuildArch: noarch
Requires: %{name}-config
Requires: %{name}-libs
Requires: %{name}-tools
Source0: https://git.rx3.org/gitea/rx3/%{name}/archive/%{name}-%{version}.tar.gz Source0: https://git.rx3.org/gitea/rx3/%{name}/archive/%{name}-%{version}.tar.gz
@@ -59,7 +64,34 @@ Source0: https://git.rx3.org/gitea/rx3/%{name}/ar
This is the base component of an Rx3 system: This is the base component of an Rx3 system:
- Default config files, - Default config files,
- Base bash libraries, - Base bash libraries,
- Default tools. - Base tools.
This meta packe will install all the depencies.
%package config
Summary: Rx3 Base Config
%description config
This is a base component of an Rx3 system: Default config files.
%package libs
Summary: Rx3 Base Libraires
%description libs
This is a base component of an Rx3 system: Base bash libraries.
%package tools
Summary: Rx3 Base Tools
Requires: %{name}-libs
%description tools
This is a base component of an Rx3 system: Base tools.
@@ -99,7 +131,7 @@ cp etc/bash_completion.d/* %{buildroot}%{_sysconfdir}/bash_completi
# Libs # Libs
%{__mkdir_p} %{buildroot}%{_prefix}/lib/rx3 %{__mkdir_p} %{buildroot}%{_prefix}/lib/rx3
cp usr/lib/rx3/*.bash %{buildroot}%{_prefix}/lib/rx3 cp lib/rx3/*.bash %{buildroot}%{_prefix}/lib/rx3
# Bin # Bin
%{__mkdir_p} %{buildroot}%{_sbindir} %{__mkdir_p} %{buildroot}%{_sbindir}
@@ -113,13 +145,28 @@ cp sbin/* %{buildroot}%{_sbindir}
# Files # Files
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
%files %files
%files config
%doc ReadMe.txt ReleaseNotes.txt ToDo.txt %doc ReadMe.txt ReleaseNotes.txt ToDo.txt
%license COPYING COPYING.LESSER GNU_GPL-3.0.txt GNU_LGPL-3.0.txt GNU_FDL-1.3.txt %license COPYING COPYING.LESSER GNU_GPL-3.0.txt GNU_LGPL-3.0.txt GNU_FDL-1.3.txt
%defattr(644,root,root) %defattr(644,root,root)
%{_sysconfdir}/profile.d/* %{_sysconfdir}/profile.d/*
%{_sysconfdir}/bash_completion.d/*
%files libs
%doc ReadMe.txt ReleaseNotes.txt ToDo.txt
%license COPYING COPYING.LESSER GNU_GPL-3.0.txt GNU_LGPL-3.0.txt GNU_FDL-1.3.txt
%defattr(644,root,root)
%{_prefix}/lib/rx3/* %{_prefix}/lib/rx3/*
%files tools
%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}/bash_completion.d/*
%attr(0755,root,root) %{_sbindir}/* %attr(0755,root,root) %{_sbindir}/*
@@ -131,6 +178,21 @@ cp sbin/* %{buildroot}%{_sbindir}
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
%changelog %changelog
* Fri Oct 30 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.2.1-1rx3.mga9
- Update to 1.2.1
* Sun Sep 13 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.2.0-1rx3.mga9
- Update to 1.2.0
* Sat Aug 1 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.1.3-1rx3.mga9
- Update to 1.1.3
* Sun May 3 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.1.2-1rx3.mga9
- Update to 1.1.2
- Split between rx3-base, rx3-base-config, rx3-base-libs and rx3-base-tools packages
- Move lib source dir
- Add cgi-bin example as doc
* Fri Apr 10 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.1.1-1rx3.mga9 * Fri Apr 10 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.1.1-1rx3.mga9
- Update to 1.1.1 - Update to 1.1.1
+11
View File
@@ -27,6 +27,17 @@
# Global Variable # Global Variable
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
for prefix in "/opt/" "/usr/" "/" "/usr/global/" "/usr/local/"
do
for suffix in bin sbin
do
dir=${prefix}${suffix}
PATH="${dir}:$(echo $PATH | sed -e "s%^${dir}:%%" -e "s%:${dir}:%:%" -e "s%:${dir}$%%")"
done
done
export PATH
export MANPATH=$MANPATH:/usr/local/share/man:/usr/global/share/man:/opt/share/man 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 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 XDG_DATA_DIRS=$XDG_DATA_DIRS:/usr/share:/usr/local/share:/usr/global/share:/opt/share
+248 -47
View File
@@ -46,45 +46,27 @@ shopt -s extglob
# Global Variable # Global Variable
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
declare -g NAME="" declare -Ag LIB_VSL_TAB=()
declare -g VERSION="" declare -g LIB_VSL_ID_LIST=""
declare -g LIB_VSL_ID_NB=0
declare -g LIB_VSL_NAME_LEN=0
declare -g LIB_VSL_VERSION_LEN=0
declare -g DUMP="FALSE" declare LIB_NAME="Base"
declare -g DRY_RUN="FALSE" declare LIB_VERSION="1.2.0"
declare -g HELP=""
declare -g VERBOSE="FALSE"
declare -g LOG_FILE="" declare -g NAME=""
declare -g LOG_LOCK="" declare -g VERSION=""
declare -g LOG_ECHO=""
declare -g LOG_TRACE="DISABLED"
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"
# Version Print
#-----------------------------------------------------------------------------------------------------------------------------------
version_print()
{
# echo "${VERSION}" | sed -e 's/.*: //' -e 's/-/ /' -e 's/_/\./g' -e 's/\$$//'
echo "${NAME} V${VERSION}"
}
#-----------------------------------------------------------------------------------------------------------------------------------
# Help Print
#-----------------------------------------------------------------------------------------------------------------------------------
help_print()
{
echo "${NAME} ${HELP}"
}
@@ -125,8 +107,8 @@ str_escape()
echo_line() echo_line()
{ {
local string="$1" local string="${1}"
local count="$2" local count="${2:-""}"
echo -en "\e[2K\r" echo -en "\e[2K\r"
@@ -161,6 +143,16 @@ echo_error()
cmd_exec() cmd_exec()
{ {
local force="FALSE"
if [[ "$1" == "FORCE" ]]
then
force="TRUE"
shift
fi
if [[ "${VERBOSE}" == "TRUE" ]] if [[ "${VERBOSE}" == "TRUE" ]]
then then
local caller="${FUNCNAME[1]:-MAIN}" local caller="${FUNCNAME[1]:-MAIN}"
@@ -171,12 +163,12 @@ cmd_exec()
echo >&2 echo >&2
fi fi
if [[ ${DUMP} == "TRUE" ]] if [[ ( "${force}" != "TRUE" ) && ( "${DUMP}" == "TRUE" ) ]]
then then
printf '%q ' "$@" printf '%q ' "$@"
echo echo
else else
if [[ "${DRY_RUN}" != "TRUE" ]] if [[ ( "${force}" == "TRUE" ) || ( "${DRY_RUN}" != "TRUE" ) ]]
then then
"$@" "$@"
fi fi
@@ -193,9 +185,19 @@ cmd_exec()
sh_exec() sh_exec()
{ {
local force="FALSE"
if [[ "$1" == "FORCE" ]]
then
force="TRUE"
shift
fi
if [[ "$#" -ne 1 ]] || [[ -z "$1" ]] if [[ "$#" -ne 1 ]] || [[ -z "$1" ]]
then then
echo_error "sh_exec expects exactly 1 non empty argument" echo_error "sh_exec expects exactly 1 non empty argument after FORCE optional flag"
return 1 return 1
fi fi
@@ -208,11 +210,11 @@ sh_exec()
printf 'bash -c %q\n' "${NAME}" "${caller}" "$1" >&2 printf 'bash -c %q\n' "${NAME}" "${caller}" "$1" >&2
fi fi
if [[ ${DUMP} == "TRUE" ]] if [[ ( "${force}" != "TRUE" ) && ( "${DUMP}" == "TRUE" ) ]]
then then
printf 'bash -c %q\n' "${NAME}" "${caller}" "$1" printf 'bash -c %q\n' "${NAME}" "${caller}" "$1"
else else
if [[ "${DRY_RUN}" != "TRUE" ]] if [[ ( "${force}" == "TRUE" ) || ( "${DRY_RUN}" != "TRUE" ) ]]
then then
bash -o errexit -o pipefail -o nounset -O extglob -c -- "$1" bash bash -o errexit -o pipefail -o nounset -O extglob -c -- "$1" bash
fi fi
@@ -223,6 +225,30 @@ sh_exec()
#-----------------------------------------------------------------------------------------------------------------------------------
# Print
#-----------------------------------------------------------------------------------------------------------------------------------
print()
{
local inline="${1}"
shift
if [[ "${inline}" == "TRUE" ]]
then
str="%s"'\\n'
else
str="%s"'\n'
fi
cmd_exec printf "${str}" "$*"
}
#-------------------------------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------------------------------
# Tab Assign # Tab Assign
#-------------------------------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------------------------------
@@ -230,10 +256,10 @@ sh_exec()
tab_assign() tab_assign()
{ {
declare -n ta_tab=$1 declare -n ta_tab=$1
ta_key=$2 local ta_key=$2
ta_value=$3 local ta_value=$3
if [[ "${ta_value}" == "-" ]] if [[ "${ta_value}" == "-" ]]
then then
ta_value="" ta_value=""
@@ -253,8 +279,8 @@ tab_assign()
var_assign() var_assign()
{ {
declare -n va_var=$1 declare -n va_var=$1
va_value=$2 local va_value=$2
va_mode=$3 local va_mode=$3
if [[ "${va_value}" == "-" ]] if [[ "${va_value}" == "-" ]]
@@ -274,6 +300,171 @@ var_assign()
#--------------------------------------------------------------------------------------------------------------------------
# VSL Add
#--------------------------------------------------------------------------------------------------------------------------
vsl_add()
{
local name
local version
local file
if [[ "${BASH_SOURCE[1]}" == "$0" ]]
then
name="${NAME}"
version="${VERSION}"
file="${0}"
else
name="${LIB_NAME}"
version="${LIB_VERSION}"
file="${BASH_SOURCE[1]}"
fi
var_assign LIB_VSL_ID_LIST "${LIB_VSL_ID_NB}" INC
tab_assign LIB_VSL_TAB "${LIB_VSL_ID_NB},Name" "${name}"
tab_assign LIB_VSL_TAB "${LIB_VSL_ID_NB},Version" "${version}"
tab_assign LIB_VSL_TAB "${LIB_VSL_ID_NB},File" "${file}"
if [[ "${#name}" -gt "${LIB_VSL_NAME_LEN}" ]]
then
LIB_VSL_NAME_LEN="${#name}"
fi
if [[ "${#version}" -gt "${LIB_VSL_VERSION_LEN}" ]]
then
LIB_VSL_VERSION_LEN="${#version}"
fi
LIB_VSL_ID_NB=$(( ${LIB_VSL_ID_NB} + 1))
}
#-----------------------------------------------------------------------------------------------------------------------------------
# VSL HTML Dump
#-----------------------------------------------------------------------------------------------------------------------------------
vsl_html_dump()
{
local reverse="$1"
local inline="$2"
local i=1
local j=1
local vsl_id
local vsl_id_list
local name
local version
local file
if [[ "${reverse}" == "TRUE" ]]
then
vsl_id_list="$( echo "${LIB_VSL_ID_LIST}" | tr ' ' '\n' | tac)"
else
vsl_id_list="$( echo "${LIB_VSL_ID_LIST}" | tr ' ' '\n')"
fi
for vsl_id in ${vsl_id_list}
do
name=${LIB_VSL_TAB["${vsl_id},Name"]}
version=${LIB_VSL_TAB["${vsl_id},Version"]}
file=${LIB_VSL_TAB["${vsl_id},File"]}
if [[ $(( $i % 2)) -eq 0 ]]
then
print "${inline}" ' <tr class="shade">'
else
print "${inline}" " <tr>"
fi
print "${inline}" " <th>${i}</th><td>${name}</td><td>${version}</td>"
if [[ "${VERBOSE}" == "TRUE" ]]
then
print "${inline}" "<td>${file}</td>"
fi
print "${inline}" " </tr>"
i=$(( $i + 1))
done
}
#-----------------------------------------------------------------------------------------------------------------------------------
# Version Print
#-----------------------------------------------------------------------------------------------------------------------------------
version_print()
{
local full="${1-TRUE}"
local name_len
local version_len
local vsl_id_list
local vsl_id
local name
local version
local file
if [[ "${full}" == "TRUE" ]]
then
vsl_id_list="$( echo "${LIB_VSL_ID_LIST}" | tr ' ' '\n' | tac)"
name_len="${LIB_VSL_NAME_LEN}"
version_len="${LIB_VSL_VERSION_LEN}"
else
vsl_id_list="$(( ${LIB_VSL_ID_NB} - 1))"
name_len="${#LIB_VSL_TAB["${vsl_id_list},Name"]}"
version_len="${#LIB_VSL_TAB["${vsl_id_list},Version"]}"
fi
name_len=$(( ${name_len} + 1 ))
version_len=$(( ${version_len} + 1 ))
for vsl_id in ${vsl_id_list}
do
name=${LIB_VSL_TAB["${vsl_id},Name"]}
version=${LIB_VSL_TAB["${vsl_id},Version"]}
file=${LIB_VSL_TAB["${vsl_id},File"]}
str="$(printf "%s%*sV %s" "${name}" "$((${name_len} - ${#name}))" " " "${version}")"
if [[ "${VERBOSE}" == "TRUE" ]]
then
str+="$(printf "%*s%s" "$((${version_len} - ${#version}))" " " "${file}")"
fi
echo "${str}"
done
}
#-----------------------------------------------------------------------------------------------------------------------------------
# Help Print
#-----------------------------------------------------------------------------------------------------------------------------------
help_print()
{
version_print ""
echo "${NAME} ${HELP}"
}
#-------------------------------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------------------------------
# File Dir Init # File Dir Init
#-------------------------------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------------------------------
@@ -490,3 +681,13 @@ log_error()
{ {
log_print "${LOG_FILE}" "${LOG_LOCK}" "${LOG_ECHO}" "ERR" "$@" log_print "${LOG_FILE}" "${LOG_LOCK}" "${LOG_ECHO}" "ERR" "$@"
} }
#--------------------------------------------------------------------------------------------------------------------------
# Main
#--------------------------------------------------------------------------------------------------------------------------
vsl_add
+9 -32
View File
@@ -39,7 +39,7 @@
# Global Variables # Global Variables
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
declare -g VERSION="1.1.1" declare -g VERSION="1.2.0"
declare -g NAME="ISL" declare -g NAME="ISL"
declare -g HELP="usage: isl [-a | --add <URL>] | [-c | --cat [-r | --reverse]] | [-H | --html_dump [-i | --inline] [-r | --reverse]] | [-t | --top [-m | --image]] | [[-h | --help] | [-V | --version] [-T | --test] [-v | --verbose]" declare -g HELP="usage: isl [-a | --add <URL>] | [-c | --cat [-r | --reverse]] | [-H | --html_dump [-i | --inline] [-r | --reverse]] | [-t | --top [-m | --image]] | [[-h | --help] | [-V | --version] [-T | --test] [-v | --verbose]"
@@ -90,7 +90,7 @@ function isl_args_parse()
# #
--) shift; break;; --) shift; break;;
*) echo_error "args_parse internal error [$1] !"; exit 1;; *) echo_error "args_parse internal error [$1] !"; exit 1;;
esac esac
done done
@@ -149,7 +149,6 @@ isl_version_print()
isl_help_print() isl_help_print()
{ {
version_print
help_print help_print
} }
@@ -157,30 +156,6 @@ isl_help_print()
#-----------------------------------------------------------------------------------------------------------------------------------
# ISL Print
#-----------------------------------------------------------------------------------------------------------------------------------
isl_print()
{
local inline="$1"
shift
if [[ "${inline}" == "TRUE" ]]
then
str="%s"'\\n'
else
str="%s"'\n'
fi
cmd_exec printf "${str}" "$*"
}
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
# ISL Add # ISL Add
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
@@ -273,9 +248,9 @@ isl_html_dump()
if [[ $(( $i % 2)) -eq 0 ]] if [[ $(( $i % 2)) -eq 0 ]]
then then
isl_print "${inline}" ' <tr class="shade">' print "${inline}" ' <tr class="shade">'
else else
isl_print "${inline}" " <tr>" print "${inline}" " <tr>"
fi fi
j=1 j=1
@@ -283,15 +258,15 @@ isl_html_dump()
do do
if [[ "$j" == "1" ]] if [[ "$j" == "1" ]]
then then
isl_print "${inline}" " <th>${!j}</th>" print "${inline}" " <th>${!j}</th>"
else else
isl_print "${inline}" " <td>${!j}</td>" print "${inline}" " <td>${!j}</td>"
fi fi
j=$(( $j + 1)) j=$(( $j + 1))
done done
isl_print "${inline}" " </tr>" print "${inline}" " </tr>"
i=$(( $i + 1)) i=$(( $i + 1))
done done
} }
@@ -335,6 +310,8 @@ isl_top()
# Main # Main
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
vsl_add
orig_args=("$@") orig_args=("$@")
isl_args_parse "$@" isl_args_parse "$@"
+12 -8
View File
@@ -39,9 +39,9 @@
# Global Variables # Global Variables
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
declare -g VERSION="1.0.1" declare -g VERSION="1.2.1"
declare -g NAME="URPMI Setup" declare -g NAME="URPMI-Setup"
declare -g HELP="usage: urpmi-setup [ [-d | --distrib <Distrib>] [-m | --mirror-mga <Mirror_List>] [-r | --mirror-rx3 <Mirror_List>] ] | [-h | --help] | [-V | --version] [ [ -D | --dump] [-T | --test] ] [-u | --update] [-v | --verbose] ) ]" declare -g HELP="usage: urpmi-setup [ [-d | --distrib <Distrib>] [-m | --mirror-mga <Mirror_List>] [-r | --mirror-rx3 <Mirror_List>] ] | [-h | --help] | [-V | --version] [ [ -D | --dump] | [-T | --test] ] [-u | --update] [-v | --verbose] ) ]"
declare -g DISTRIB_DEF="9" declare -g DISTRIB_DEF="9"
@@ -52,6 +52,8 @@ declare -g MIRRORLIST_MGA=""
declare -g MIRRORLIST_RX3="" declare -g MIRRORLIST_RX3=""
declare -g UPDATE="FALSE" declare -g UPDATE="FALSE"
declare -g RX3_CA_URL="http://www.rx3/rx3_root_ca.crt"
@@ -110,7 +112,7 @@ function us_args_parse()
# #
--) shift; break;; --) shift; break;;
*) echo_error "args_parse internal error [$1] !"; exit 1;; *) echo_error "args_parse internal error [$1] !"; exit 1;;
esac esac
done done
@@ -153,7 +155,6 @@ us_version_print()
us_help_print() us_help_print()
{ {
version_print
help_print help_print
} }
@@ -165,13 +166,14 @@ us_help_print()
# Main # Main
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
vsl_add
orig_args=("$@") orig_args=("$@")
us_args_parse "$@" us_args_parse "$@"
case "${MODE}" in case "${MODE}" in
"EXIT") "EXIT")
exit ${EXIT_CODE} exit ${EXIT_CODE}
;; ;;
@@ -188,9 +190,11 @@ case "${MODE}" in
esac esac
echo_error "${NAME}: Mode: [${MODE}] Verbose: [${VERBOSE}] Dump: [${DUMP}] Dry_Run: [${DRY_RUN}] Distrib: [${DISTRIB}] MirrorList_MGA: [${MIRRORLIST_MGA}] MirrorList_RX3: [${MIRRORLIST_RX3}] Update: [${UPDATE}]" echo_error "${NAME}: Mode: [${MODE}] Verbose: [${VERBOSE}] Dump: [${DUMP}] Dry_Run: [${DRY_RUN}] Distrib: [${DISTRIB}] MirrorList_MGA: [${MIRRORLIST_MGA}] MirrorList_RX3: [${MIRRORLIST_RX3}] Update: [${UPDATE}]"
cmd_exec curl ${RX3_CA_URL} >/etc/pki/ca-trust/source/anchors/rx3_root_ca.crt
cmd_exec update-ca-trust extract
cmd_exec urpmi.removemedia -a cmd_exec urpmi.removemedia -a
cmd_exec rm -f /var/cache/urpmi/mirrors.cache cmd_exec rm -f /var/cache/urpmi/mirrors.cache
cmd_exec urpmi.addmedia --distrib --mirrorlist "${MIRRORLIST_MGA}" cmd_exec urpmi.addmedia --distrib --mirrorlist "${MIRRORLIST_MGA}"
+61
View File
@@ -0,0 +1,61 @@
#!/bin/bash
#-----------------------------------------------------------------------------------------------------------------------------------
#
# URPMI Setup CGI
#
# Copyright (C) 2026 Arnaud G. GIBERT
# mailto:arnaud@rx3.net
#
# This is free software: you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published
# by the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; If not, see
# <https://www.gnu.org/licenses/>.
#
#-----------------------------------------------------------------------------------------------------------------------------------
#-----------------------------------------------------------------------------------------------------------------------------------
# Includes
#-----------------------------------------------------------------------------------------------------------------------------------
: "${RX3_LIB_DIR:=/usr/lib/rx3}"
. "${RX3_LIB_DIR}/docker_tools.bash"
#-----------------------------------------------------------------------------------------------------------------------------------
# Main
#-----------------------------------------------------------------------------------------------------------------------------------
echo "Content-type: text/plain"
echo ""
if [[ -n "${QUERY_STRING}" ]]
then
if [[ "$QUERY_STRING" =~ ^[a-z0-9]+$ ]]
then
DISTRIB_OPT="-d ${QUERY_STRING}"
else
echo "Error: Invalid characters in query string."
exit 1
fi
else
DISTRIB_OPT=""
fi
urpmi-setup -v -D ${DISTRIB_OPT}