2 Commits

Author SHA1 Message Date
42ea9e4bf7 - Migrate to rx3 base library.
- Support rx3-base 1.1.2.
2026-04-20 17:36:35 +02:00
3080925ce5 - Add bash completion support,
- Fix html file location.
2026-03-21 13:17:39 +01:00
10 changed files with 295 additions and 153 deletions

View File

@@ -1,3 +1,21 @@
------------------------------------------------------------------------------------------------------------------------------------
MPM V 1.1.2 - A. GIBERT - 2026/04/20
------------------------------------------------------------------------------------------------------------------------------------
- Migrate to rx3 base library.
- Support rx3-base 1.1.2.
------------------------------------------------------------------------------------------------------------------------------------
MPM V 1.1.1 - A. GIBERT - 2026/03/21
------------------------------------------------------------------------------------------------------------------------------------
- Add bash completion support,
- Fix html file location.
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
MPM V 1.1.0 - A. GIBERT - 2026/03/14 MPM V 1.1.0 - A. GIBERT - 2026/03/14
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------

View File

@@ -1,5 +1,30 @@
#-----------------------------------------------------------------------------------------------------------------------------------
#
# MPM (Meta Package Manager)
#
# Copyright (C) 2024-2026 Arnaud G. GIBERT
# mailto:arnaud@rx3.net
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or 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, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
#-----------------------------------------------------------------------------------------------------------------------------------
%define name mpm %define name mpm
%define version 1.1.0 %define version 1.1.2
%define release %mkrel 1rx3 %define release %mkrel 1rx3
%global debug_package %{nil} %global debug_package %{nil}
@@ -68,14 +93,15 @@ This is the server repository.
%install %install
# Client # Client
install -D -pm 644 etc/%{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf install -D -pm 644 etc/%{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf
install -D -pm 755 sbin/%{name} %{buildroot}%{_sbindir}/%{name} install -D -pm 644 etc/bash_completion.d/%{name} %{buildroot}%{_sysconfdir}/bash_completion.d/%{name}
install -D -pm 755 sbin/%{name} %{buildroot}%{_sbindir}/%{name}
# Server # Server
cd var/www/%{name}-repository cd www/html/%{name}-repository
for file in *.mpm for file in *.mpm
do do
install -D -pm 644 ${file} %{buildroot}%{_webhtml}/%{name}-repository/${file} install -D -pm 644 ${file} %{buildroot}%{_webhtml}/%{name}-repository/${file}
done done
@@ -100,6 +126,7 @@ done
%doc ReadMe.txt ReleaseNotes.txt ToDo.txt %doc ReadMe.txt ReleaseNotes.txt ToDo.txt
%license GNU_GPL-3.0.txt %license GNU_GPL-3.0.txt
%config(noreplace) %{_sysconfdir}/%{name}.conf %config(noreplace) %{_sysconfdir}/%{name}.conf
%{_sysconfdir}/bash_completion.d/%{name}
%{_sbindir}/%{name} %{_sbindir}/%{name}
@@ -116,5 +143,13 @@ done
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
%changelog %changelog
* Mon Apr 20 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.1.2-1rx3.mga9
- Update to 1.1.2
* Sat Mar 21 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.1.1-1rx3.mga9
- Update to 1.1.1
- Add bash completion support
- Fix html file location
* Sat Mar 14 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.1.0-1rx3.mga9 * Sat Mar 14 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.1.0-1rx3.mga9
- Create initial SPEC file for 1.1.0 on Mageia 9 - Create initial SPEC file for 1.1.0 on Mageia 9

95
etc/bash_completion.d/mpm Normal file
View File

@@ -0,0 +1,95 @@
#!/bin/bash
#-----------------------------------------------------------------------------------------------------------------------------------
#
# MPM (Meta Package Manager) Bash Completion
#
# Copyright (C) 2024-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 Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; If not, see
# <https://www.gnu.org/licenses/>.
#
#-----------------------------------------------------------------------------------------------------------------------------------
#-----------------------------------------------------------------------------------------------------------------------------------
# MPM Completion
#-----------------------------------------------------------------------------------------------------------------------------------
_mpm_completion()
{
local cur="${COMP_WORDS[COMP_CWORD]}"
local prev="${COMP_WORDS[COMP_CWORD-1]}"
local opts="-h --help -V --version -v --verbose -T --test -l --list -i --install -r --repo"
local pos=0
local i
COMPREPLY=()
# Count non-option positional arguments already provided
for (( i=1; i<COMP_CWORD; i++ ))
do
case "${COMP_WORDS[i]}" in
-h|--help|-V|--version|-v|--verbose|-T|--test|-l|--list)
;;
-i|--install|-r|--repo)
i=$(( i + 1 ))
;;
--)
;;
-*)
;;
*)
pos=$(( pos + 1 ))
;;
esac
done
# Complete options if current word starts with '-'
if [[ "${cur}" == -* ]]
then
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
fi
# Complete based on previous option
case "${prev}" in
-i|--install)
local mpm_names
mpm_names="$(mpm --list 2>/dev/null | awk 'NR>2 { gsub(/^ +/, "", $1); print $1 }')"
COMPREPLY=( $(compgen -W "${mpm_names}" -- "${cur}") )
return 0
;;
-r|--repo)
COMPREPLY=()
return 0
;;
esac
# Complete positional arguments
case "${pos}" in
0)
COMPREPLY=( $(compgen -W "-h --help -V --version -v --verbose -T --test -l --list -i --install -r --repo" -- "${cur}") )
;;
*)
COMPREPLY=()
;;
esac
return 0
}
complete -o filenames -F _mpm_completion mpm

View File

@@ -1,7 +1,8 @@
#-------------------------------------------------------------------------------# #-----------------------------------------------------------------------------------------------------------------------------------
# #
# MPM (Meta Package Manager) # MPM (Meta Package Manager)
# Copyright (C) 2024 Arnaud G. GIBERT #
# Copyright (C) 2024-2026 Arnaud G. GIBERT
# mailto:arnaud@rx3.net # mailto:arnaud@rx3.net
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
@@ -18,7 +19,7 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
#------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
# Default MPM repository # Default MPM repository

247
sbin/mpm
View File

@@ -1,62 +1,72 @@
#!/bin/bash #!/bin/bash
#-------------------------------------------------------------------------------# #-----------------------------------------------------------------------------------------------------------------------------------
# #
# MPM (Meta Package Manager) # MPM (Meta Package Manager)
#
# Copyright (C) 2024-2026 Arnaud G. GIBERT # Copyright (C) 2024-2026 Arnaud G. GIBERT
# mailto:arnaud@rx3.net # mailto:arnaud@rx3.net
# #
# This program is free software; you can redistribute it and/or # This is free software: you can redistribute it and/or modify it
# modify it under the terms of the GNU General Public License # under the terms of the GNU Lesser General Public License as published
# as published by the Free Software Foundation; either version 2 # by the Free Software Foundation, either version 3 of the License, or
# of the License, or any later version. # (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU Lesser General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU Lesser General Public
# along with this program; if not, write to the Free Software # License along with this program; If not, see
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # <https://www.gnu.org/licenses/>.
# #
#------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
command="$1"
arg="$2"
#-----------------------------------------------------------------------------------------------------------------------------------
# Includes
#-----------------------------------------------------------------------------------------------------------------------------------
: "${RX3_LIB_DIR:=/usr/lib/rx3}"
. "${RX3_LIB_DIR}/base.bash"
#-----------------------------------------------------------------------------------------------------------------------------------
# Global Variables
#-----------------------------------------------------------------------------------------------------------------------------------
declare -g VERSION="1.1.2"
declare -g NAME="mpm"
declare -g HELP="usage: [-h | --help] | [-V | --version] | [-l | --list] | [-i | --install <mpm_name>] [-T | --test] [-v | --verbose] [-r | --repo <repository_url>]"
declare -g MODE="DEFAULT"
declare -g VERBOSE="FALSE"
declare -g DRY_RUN="FALSE"
declare -g RETVAL=0
declare -g MPM_REPO="https://www.rx3.net/mpm-repository"
declare -g MPM_NAME=""
if [[ -f /etc/mpm.conf ]] if [[ -f /etc/mpm.conf ]]
then then
. /etc/mpm.conf . /etc/mpm.conf
else
MPM_REPO="https://www.rx3.net/mpm-repository"
fi fi
VERSION=1.1.0
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
# Exec CMD # Version Print
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
exec_cmd() mpm_version_print()
{ {
cmd="$1" version_print
if [[ "${verbose}" == "true" ]]
then
echo "${cmd}" 1>&2
fi
if [[ "${dry_run}" != "true" ]]
then
eval "${cmd}"
fi
} }
@@ -64,27 +74,14 @@ exec_cmd()
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
# MPM Help # Help Print
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
function mpm_version_print() mpm_help_print()
{
echo "MPM Version: [${VERSION}]"
}
#-----------------------------------------------------------------------------------------------------------------------------------
# MPM Help
#-----------------------------------------------------------------------------------------------------------------------------------
function mpm_help_print()
{ {
mpm_version_print mpm_version_print
echo "Repository URL: [${MPM_REPO}]" echo_error "Repository URL: [${MPM_REPO}]"
echo "usage: mpm [-h | --help] | [-V | --version] | [-l | --list] | [-i | --install <mpm_name>] [-T | --test] [-v | --verbose] [-r | --repo <repository_url>]" help_print
} }
@@ -95,48 +92,41 @@ function mpm_help_print()
# Arg Parse # Arg Parse
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
function mpm_args_parse() mpm_args_parse()
{ {
mode="default" tmp_args=$(getopt -o hi:lr:TvV --long help,install:,list,repo:,test,verbose,version -n "${NAME}" -- "$@")
verbose="false"
dry_run="false"
if [ $? != 0 ]; then echo_error "Terminating..." >&2; exit 1; fi
tmp_args=$(getopt -o hi:lr:TvV --long help,install:,list,repo:,test,verbose,version -- "$@")
if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
# Note the quotes around `$tmp_args': they are essential!
eval set -- "${tmp_args}" eval set -- "${tmp_args}"
while true ; do while true
case "$1" in do
# Path options case "$1" in
-r|--repo) shift; MPM_REPO="$1"; shift;; # Path options
-r|--repo) MPM_REPO="$2"; shift; shift;;
# Options # Mode switches
-h|--help) MODE="EXIT"; mpm_help_print; shift;;
-i|--install) MODE="INSTALL"; MPM_NAME="$2"; shift; shift;;
-l|--list) MODE="LIST"; shift;;
-V|--version) MODE="EXIT"; mpm_version_print; shift;;
# Mode switches # Global options
-h|--help) mode="exit"; mpm_help_print; shift;; -T|--test) DRY_RUN="TRUE"; shift;;
-i|--install) shift; mode="install"; mpm_name="$1"; shift;; -v|--verbose) VERBOSE="TRUE"; shift;;
-l|--list) mode="list"; shift;;
-V|--version) mode="exit"; mpm_version_print; shift;;
# Global options # End of options
-T|--test) dry_run="true"; shift;; --) shift; break;;
-v|--verbose) verbose="true"; shift;; *) echo_error "args_parse internal error [$1]!"; exit 1;;
esac
#
--) shift; break;;
*) echo "args_parse internal error [$1] !"; exit 1;;
esac
done done
if [[ "${mode}" == "default" ]] if [[ "${MODE}" == "DEFAULT" ]]
then then
echo "Help, Install, List or Version should invoked!" MODE="EXIT"
mode="exit" echo_error "Help, Install, List or Version should be invoked!"
mpm_help_print mpm_help_print
exit 1 exit 1
@@ -148,16 +138,16 @@ function mpm_args_parse()
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
# MPM Meta Package List # Meta Package List
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
function mpm_mpkg_list() mpm_mpkg_list()
{ {
if [[ "${MPM_REPO}" =~ ^https?:// ]] if [[ "${MPM_REPO}" =~ ^https?:// ]]
then then
echo "$(curl -L 2>/dev/null "${MPM_REPO}" | grep -e '\.mpm</a>' | sed -e 's/.*href="//' -e 's/\.mpm".*//')" cmd_exec curl -L "${MPM_REPO}" 2>/dev/null | grep -e '\.mpm</a>' | sed -e 's/.*href="//' -e 's/\.mpm".*//'
else else
echo "$(ls ${MPM_REPO}/*.mpm | sed -e "s%^${MPM_REPO}/%%" -e 's/\.mpm$//')" ls "${MPM_REPO}"/*.mpm | sed -e "s%^${MPM_REPO}/%%" -e 's/\.mpm$//'
fi fi
} }
@@ -166,19 +156,19 @@ function mpm_mpkg_list()
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
# MPM Meta Package Tag Read # Meta Package Tag Read
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
function mpm_mpkg_tag_read() mpm_mpkg_tag_read()
{ {
mpkg="$1" local mpkg="$1"
tag="$2" local tag="$2"
if [[ "${MPM_REPO}" =~ ^https?:// ]] if [[ "${MPM_REPO}" =~ ^https?:// ]]
then then
echo "$(curl -L 2>/dev/null "${MPM_REPO}/${mpkg}.mpm" | grep -e "${tag}: " | sed -e "s/^${tag}: //")" cmd_exec curl -L "${MPM_REPO}/${mpkg}.mpm" 2>/dev/null | grep -e "${tag}: " | sed -e "s/^${tag}: //"
else else
echo "$(cat 2>/dev/null "${MPM_REPO}/${mpkg}.mpm" | grep -e "${tag}: " | sed -e "s/^${tag}: //")" grep -e "${tag}: " "${MPM_REPO}/${mpkg}.mpm" 2>/dev/null | sed -e "s/^${tag}: //"
fi fi
} }
@@ -187,12 +177,12 @@ function mpm_mpkg_tag_read()
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
# MPM Meta Package Description # Meta Package Description
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
function mpm_mpkg_desc() mpm_mpkg_desc()
{ {
mpkg="$1" local mpkg="$1"
mpm_mpkg_tag_read "${mpkg}" "PKG_DESC" mpm_mpkg_tag_read "${mpkg}" "PKG_DESC"
} }
@@ -202,12 +192,12 @@ function mpm_mpkg_desc()
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
# MPM Meta Package List # Meta Package Package List
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
function mpm_mpkg_pkglist() mpm_mpkg_pkglist()
{ {
mpkg="$1" local mpkg="$1"
mpm_mpkg_tag_read "${mpkg}" "PKG_LIST" mpm_mpkg_tag_read "${mpkg}" "PKG_LIST"
} }
@@ -217,18 +207,22 @@ function mpm_mpkg_pkglist()
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
# MPM List # List
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
function mpm_list() mpm_list()
{ {
local mpkg
local desc
local pkglist
echo " MPM Name | MPM Description | Package List " echo " MPM Name | MPM Description | Package List "
echo "---------------------+----------------------------------+---------------------------------------------------------------------------" echo "---------------------+----------------------------------+---------------------------------------------------------------------------"
mpm_mpkg_list | while read mpkg mpm_mpkg_list | while read -r mpkg
do do
desc="$(mpm_mpkg_desc $mpkg)" desc="$(mpm_mpkg_desc "${mpkg}")"
pkglist="$(mpm_mpkg_pkglist $mpkg)" pkglist="$(mpm_mpkg_pkglist "${mpkg}")"
printf "%20s | %-32s | %s\n" "${mpkg}" "${desc}" "${pkglist}" printf "%20s | %-32s | %s\n" "${mpkg}" "${desc}" "${pkglist}"
done done
@@ -239,44 +233,43 @@ function mpm_list()
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
# MPM Install # Install
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
function mpm_install mpm_install()
{ {
mpkg=$1 local mpkg="$1"
local pkglist
if [[ "${mpkg}" == "" ]] if [[ "${mpkg}" == "" ]]
then then
echo "missing required mpkg name" echo_error "Missing required mpkg name!"
mpm_help
exit 1 exit 1
fi fi
mpm_mpkg_list | grep -qe "^${mpkg}$" -e "^${mpkg} " -e " ${mpkg}$" -e " ${mpkg} "
mpm_mpkg_list | grep -e "^${mpkg}$" -e "^${mpkg} " -e " ${mpkg}$" -e " ${mpkg} " 2>&1 >/dev/null if [[ "$?" == "1" ]]
if [[ "$?" == 1 ]]
then then
echo "mpkg [${mpkg}] not found!" echo_error "mpkg [${mpkg}] not found!"
exit 1 exit 1
fi fi
pkglist="$(mpm_mpkg_pkglist "${mpkg}")"
pkglist="$(mpm_mpkg_pkglist $mpkg)"
if [[ "${pkglist}" == "" ]] if [[ "${pkglist}" == "" ]]
then then
echo "package list is empty!" echo_error "Package list is empty!"
exit 1 exit 1
fi fi
echo "installing MPM: [$mpkg]:[${pkglist}]" echo "Installing MPM: [${mpkg}]:[${pkglist}]"
exec_cmd "urpmi --force ${pkglist}" cmd_exec urpmi --force ${pkglist}
} }
@@ -284,33 +277,33 @@ function mpm_install
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
# MPM Main # Main
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
shopt -s extglob
mpm_args_parse "$@" mpm_args_parse "$@"
if [[ ${mode} == "exit" ]] if [[ "${MODE}" == "EXIT" ]]
then then
exit 0 exit 0
fi fi
echo_error "Mode: [${MODE}] Verbose: [${VERBOSE}] Dry_Run: [${DRY_RUN}] Repo_URL: [${MPM_REPO}]"
case "${MODE}" in
echo "mode: [${mode}] verbose: [${verbose}] dry_run: [${dry_run}] Repo_URL: [${MPM_REPO}]" 1>&2 LIST)
case "${mode}"
in
"list")
mpm_list mpm_list
;; ;;
"install") INSTALL)
mpm_install "${mpm_name}" mpm_install "${MPM_NAME}"
;;
*)
mpm_help_print
RETVAL=1
;; ;;
esac esac
exit 0 exit ${RETVAL}

View File

@@ -1,3 +1,3 @@
# # MariaDB MPM
PKG_DESC: MariaDB/MySQL Client PKG_DESC: MariaDB/MySQL Client
PKG_LIST: mariadb-client PKG_LIST: mariadb-client

View File

@@ -1,3 +1,3 @@
# # PostgreSQL MPM
PKG_DESC: PostgreSQL Client PKG_DESC: PostgreSQL Client
PKG_LIST: postgresql15 PKG_LIST: postgresql15