VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-08-01 15:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix to improve new params names

Browse Source
This commit is contained in:
Ilia Ross
2025-01-11 05:31:14 +02:00
parent ec4b331709
commit 7eb8e4d336
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
webmin-setup-repo.sh
View File

@ -66,7 +66,7 @@ Repository configuration:
--key-suffix=<suffix> Repository key suffix for file naming --key-suffix=<suffix> Repository key suffix for file naming
--auth-user=<user> Repository authentication username --auth-user=<user> Repository authentication username
--auth-pass=<pass> Repository authentication password --auth-pass=<pass> Repository authentication password
--pkg-excl=<dist:pkg|pri*> Package name to exclude --pkg-prefs=<dist:pkg|pr*> Package preferences for repository
Repository metadata: Repository metadata:
--name=<name> Base name for repository (default: webmin) --name=<name> Base name for repository (default: webmin)
@ -131,8 +131,8 @@ process_args() {
--auth-pass=*) --auth-pass=*)
repo_auth_pass="${arg#*=}" repo_auth_pass="${arg#*=}"
;; ;;
--pkg-excl=*) --pkg-prefs=*)
repo_pkg_prio="${arg#*=}" repo_pkg_prefs="${arg#*=}"
;; ;;
--name=*) --name=*)
base_name="${arg#*=}" base_name="${arg#*=}"
@ -331,18 +331,18 @@ check_gpg() {
} }
enforce_package_priority() { enforce_package_priority() {
repo_pkg_priority=$1 repo_pkg_pref=$1
target=$2 disttarget=$2
# Extract the relevant entry for the target # Extract the relevant entries for the target distribution
match=$(echo "$repo_pkg_priority" | grep -o "${target}:[^ =]*[^ ]*") match=$(echo "$repo_pkg_pref" | grep -o "${disttarget}:[^ =]*[^ ]*")
if [ -n "$match" ]; then if [ -n "$match" ]; then
# Extract the package name # Extract the package name
package=$(echo "$match" | sed -e "s/^${target}:\([^=]*\).*/\1/") package=$(echo "$match" | sed -e "s/^${disttarget}:\([^=]*\).*/\1/")
# Extract the priority and version parameters (if present) # Extract the priority and version parameters (if present)
priority=$(echo "$match" | sed -n -e "s/^${target}:[^=]*=\([^=]*\)=.*$/\1/p") priority=$(echo "$match" | sed -n -e "s/^${disttarget}:[^=]*=\([^=]*\)=.*$/\1/p")
version=$(echo "$match" | sed -n -e "s/^${target}:[^=]*=[^=]*=\(.*\)$/\1/p") version=$(echo "$match" | sed -n -e "s/^${disttarget}:[^=]*=[^=]*=\(.*\)$/\1/p")
# Output package, priority, and version parameters (empty if not present) # Output package, priority, and version parameters (empty if not present)
echo "$package ${priority:-} ${version:-}" echo "$package ${priority:-} ${version:-}"
@ -380,11 +380,11 @@ setup_repos() {
"/etc/pki/rpm-gpg/RPM-GPG-KEY-$repo_key_suffix" "/etc/pki/rpm-gpg/RPM-GPG-KEY-$repo_key_suffix"
echo " .. done" echo " .. done"
# Configure packages priority if provided # Configure packages priority if provided
if [ -n "$repo_pkg_prio" ]; then if [ -n "$repo_pkg_prefs" ]; then
repo_pkg_prio_rs=$(enforce_package_priority "$repo_pkg_prio" "rpm") repo_pkg_prefs_rs=$(enforce_package_priority "$repo_pkg_prefs" "rpm")
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo " Setting up package exclusion for repository .." echo " Setting up package exclusion for repository .."
package=$(echo "$repo_pkg_prio_rs" | awk '{print $1}') package=$(echo "$repo_pkg_prefs_rs" | awk '{print $1}')
repo_extra_opts="exclude=$package" repo_extra_opts="exclude=$package"
echo " .. done" echo " .. done"
else else
@ -426,13 +426,13 @@ EOF
echo "$sources_list" > /etc/apt/sources.list echo "$sources_list" > /etc/apt/sources.list
# Configure packages priority if provided # Configure packages priority if provided
debian_repo_prefs="/etc/apt/preferences.d/$repoid_debian_like-$repo_dist-package-priority" debian_repo_prefs="/etc/apt/preferences.d/$repoid_debian_like-$repo_dist-package-priority"
if [ -n "$repo_pkg_prio" ]; then if [ -n "$repo_pkg_prefs" ]; then
repo_pkg_prio_rs=$(enforce_package_priority "$repo_pkg_prio" "deb") repo_pkg_prefs_rs=$(enforce_package_priority "$repo_pkg_prefs" "deb")
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo " Setting up package priority for repository .." echo " Setting up package priority for repository .."
package=$(echo "$repo_pkg_prio_rs" | awk '{print $1}') package=$(echo "$repo_pkg_prefs_rs" | awk '{print $1}')
priority=$(echo "$repo_pkg_prio_rs" | awk '{print $2}') priority=$(echo "$repo_pkg_prefs_rs" | awk '{print $2}')
version=$(echo "$repo_pkg_prio_rs" | awk '{print $3}') version=$(echo "$repo_pkg_prefs_rs" | awk '{print $3}')
cat << EOF > "$debian_repo_prefs" cat << EOF > "$debian_repo_prefs"
Package: $package Package: $package
Pin: version /$version\$/ Pin: version /$version\$/