bryan/installJRMC
1
0
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Rename --universal to --compat

Browse Source
This commit is contained in:
Bryan Roessler
2022-01-02 01:55:53 -05:00
parent e614ad023b
commit 744a1df3ae
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -47,7 +47,7 @@ You can always find the latest supported options by running `installJRMC --help`
The webroot directory to install the repo (Default: /srv/jriver/) The webroot directory to install the repo (Default: /srv/jriver/)
--createrepo-user USER --createrepo-user USER
The web server user (Default: current user) The web server user (Default: current user)
--universal --compat
Build/install RPM without minimum version specifiers Build/install RPM without minimum version specifiers
--version, -v --version, -v
Print this script version and exit Print this script version and exit

10
installJRMC
View File

@@ -68,7 +68,7 @@ printHelp() {
The web server user (Default: current user) The web server user (Default: current user)
--createrepo-suse --createrepo-suse
Override OS detection and run --createrepo with SUSE RPM Override OS detection and run --createrepo with SUSE RPM
--universal --compat
Build/install RPM without minimum version specifiers Build/install RPM without minimum version specifiers
--version, -v --version, -v
Print this script version and exit Print this script version and exit
@@ -238,7 +238,7 @@ parseInput() {
_install="repo" _install="repo"
fi fi
if _input=$(getopt -o +i:vdhus:c: -l install:,build,build-suse,outputdir:,mcversion:,restorefile:,betapass:,service-user:,service:,version,debug,help,uninstall,createrepo,createrepo-suse,createrepo-webroot:,createrepo-user:,vncpass:,display:,container:,tests,universal -- "$@"); then if _input=$(getopt -o +i:vdhus:c: -l install:,build,build-suse,outputdir:,mcversion:,restorefile:,betapass:,service-user:,service:,version,debug,help,uninstall,createrepo,createrepo-suse,createrepo-webroot:,createrepo-user:,vncpass:,display:,container:,tests,compat -- "$@"); then
eval set -- "$_input" eval set -- "$_input"
while true; do while true; do
case "$1" in case "$1" in
@@ -299,8 +299,8 @@ parseInput() {
--display) --display)
shift && _display="$1" shift && _display="$1"
;; ;;
--universal) --compat)
_universal=true _compat=true
;; ;;
--container|-c) --container|-c)
shift && _containers+=("$1") shift && _containers+=("$1")
@@ -691,7 +691,7 @@ buildRPM() {
EOF EOF
fi fi
if [[ -v _universal ]]; then if [[ -v _compat ]]; then
# Strip minimum versions # Strip minimum versions
_custom_requires=$(echo "$_custom_requires" | awk -F" " 'NF == 4 {print $1 " " $2} NF != 4 {print $0}') _custom_requires=$(echo "$_custom_requires" | awk -F" " 'NF == 4 {print $1 " " $2} NF != 4 {print $0}')
_global_requires=$(echo "$_global_requires" | awk -F" " 'NF == 4 {print $1 " " $2} NF != 4 {print $0}') _global_requires=$(echo "$_global_requires" | awk -F" " 'NF == 4 {print $1 " " $2} NF != 4 {print $0}')