pmodules/Pmodules
1
0
Fork 0
mirror of https://github.com/Pmodules/Pmodules.git synced 2026-06-27 18:13:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cherry-pick-ed30c4a7' into '1.1.22'

Browse Source 
Merge branch '357-modulecmd-hostname-can-be-the-short-name' into 'master'

See merge request Pmodules/src!362
This commit is contained in:
gsell
2024-09-10 10:30:39 +02:00
parent 5dac0f19b2 7056ea8365
commit 60eefb5df8
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pmodules/libstd.bash
+1
View File
@@ -51,6 +51,7 @@ file=$(std::def_cmd 'file'); declare -r file
find=$(std::def_cmd 'find'); declare -r find
getopt=$(std::def_cmd 'getopt'); declare -r getopt
grep=$(std::def_cmd 'grep'); declare -r grep
hostname=$(std::def_cmd 'hostname'); declare -r hostname
install=$(std::def_cmd 'install'); declare -r install
logger=$(std::def_cmd 'logger'); declare -r logger
make=$(std::def_cmd 'make'); declare -r make
Pmodules/modulecmd.bash.in
+5 -2
View File
@@ -64,6 +64,9 @@ TmpFile=$( ${mktemp} /tmp/Pmodules.XXXXXX ) \
|| std::die 1 "Oops: unable to create tmp file!"
declare -r TmpFile
HostName=$(${hostname} -f)
declare -r HostName
declare -A Subcommands=()
declare -A Options=()
declare -A Help=()
@@ -393,7 +396,7 @@ is_available(){
[[ -z ${ref_cfg['blocklist']} ]] && return 0
local -- s=''
for s in ${ref_cfg['blocklist']}; do
if [[ "${os_release}" =~ $s ]] || [[ "${HOSTNAME}" =~ $s ]]; then
if [[ "${os_release}" =~ $s ]] || [[ "${HostName}" =~ $s ]]; then
return 0
fi
done
@@ -403,7 +406,7 @@ is_available(){
[[ -z ${ref_cfg['systems']} ]] && return 0
local -- s=''
for s in ${ref_cfg['systems']}; do
if [[ "${os_release}" =~ $s ]] || [[ "${HOSTNAME}" =~ $s ]]; then
if [[ "${os_release}" =~ $s ]] || [[ "${HostName}" =~ $s ]]; then
return 0
fi
done