proxy/installer/configure-proxy.sh | 51 ++++++++++++++-----------
proxy/installer/spacewalk-proxy-installer.spec | 5 +-
rel-eng/packages/spacewalk-proxy-installer | 2
3 files changed, 35 insertions(+), 23 deletions(-)
New commits:
commit 9decefede84e0bb5edc34e5cf4d4cba5bbb0af01
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Apr 3 11:41:07 2013 +0200
Automatic commit of package [spacewalk-proxy-installer] release [1.10.2-1].
diff --git a/proxy/installer/spacewalk-proxy-installer.spec
b/proxy/installer/spacewalk-proxy-installer.spec
index 912842e..fa581b3 100644
--- a/proxy/installer/spacewalk-proxy-installer.spec
+++ b/proxy/installer/spacewalk-proxy-installer.spec
@@ -2,7 +2,7 @@ Name: spacewalk-proxy-installer
Summary: Spacewalk Proxy Server Installer
Group: Applications/Internet
License: GPLv2
-Version: 1.10.1
+Version: 1.10.2
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -96,6 +96,9 @@ spacewalk-pylint $RPM_BUILD_ROOT/usr/share/rhn
%doc LICENSE answers.txt
%changelog
+* Wed Apr 03 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.2-1
+- 896125 - fixed missing arguments issue
+
* Fri Mar 29 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.1-1
- 896125 - make Y/N values optional
- 896125 - report extra commandline arguments
diff --git a/rel-eng/packages/spacewalk-proxy-installer
b/rel-eng/packages/spacewalk-proxy-installer
index 546ca81..5cd1691 100644
--- a/rel-eng/packages/spacewalk-proxy-installer
+++ b/rel-eng/packages/spacewalk-proxy-installer
@@ -1 +1 @@
-1.10.1-1 proxy/installer/
+1.10.2-1 proxy/installer/
commit 8c3d36cbe1f9b1bee9cfaa192652f6b87969552c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Apr 3 11:38:43 2013 +0200
896125 - fixed missing arguments issue
diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh
index eade904..1e9a93b 100755
--- a/proxy/installer/configure-proxy.sh
+++ b/proxy/installer/configure-proxy.sh
@@ -91,6 +91,14 @@ parse_answer_file () {
done
}
+set_value() {
+ local OPTION="$1"
+ local VAR="$2"
+ local ARG="$3"
+ [[ "$ARG" =~ ^- ]] && echo "$0: option $OPTION requires
argument!" && print_help
+ eval "$VAR=$ARG"
+}
+
INTERACTIVE=1
CNAME_INDEX=0
@@ -105,31 +113,32 @@ eval set -- "$OPTS"
while : ; do
case "$1" in
--help|-h) print_help;;
- --answer-file) parse_answer_file "$2"; shift;;
+ --answer-file) set_value "$1" ANSWER_FILE "$2";
+ parse_answer_file "$ANSWER_FILE"; shift;;
--non-interactive) INTERACTIVE=0;;
- --version) VERSION=$2; shift;;
- --rhn-parent) RHN_PARENT="$2"; shift;;
- --traceback-email) TRACEBACK_EMAIL="$2"; shift;;
+ --version) set_value "$1" VERSION "$2"; shift;;
+ --rhn-parent) set_value "$1" RHN_PARENT "$2"; shift;;
+ --traceback-email) set_value "$1" TRACEBACK_EMAIL "$2";
shift;;
--use-ssl) USE_SSL="${2:-1}"; shift;;
- --ca-chain) CA_CHAIN="$2"; shift;;
+ --ca-chain) set_value "$1" CA_CHAIN "$2"; shift;;
--force-own-ca) FORCE_OWN_CA=1;;
- --http-proxy) HTTP_PROXY="$2"; shift;;
- --http-username) HTTP_USERNAME="$2"; shift;;
- --http-password) HTTP_PASSWORD="$2"; shift;;
- --ssl-build-dir) SSL_BUILD_DIR="$2"; shift;;
- --ssl-org) SSL_ORG="$2"; shift;;
- --ssl-orgunit) SSL_ORGUNIT="$2"; shift;;
- --ssl-common) SSL_COMMON="$2"; shift;;
- --ssl-city) SSL_CITY="$2"; shift;;
- --ssl-state) SSL_STATE="$2"; shift;;
- --ssl-country) SSL_COUNTRY="$2"; shift;;
- --ssl-email) SSL_EMAIL="$2"; shift;;
- --ssl-password) SSL_PASSWORD="$2"; shift;;
- --ssl-cname) SSL_CNAME_PARSED[CNAME_INDEX++]=--set-cname="$2"; shift;;
- --install-monitoring) INSTALL_MONITORING="${2:-Y}"; shift;;
+ --http-proxy) set_value "$1" HTTP_PROXY "$2"; shift;;
+ --http-username) set_value "$1" HTTP_USERNAME "$2"; shift;;
+ --http-password) set_value "$1" HTTP_PASSWORD "$2"; shift;;
+ --ssl-build-dir) set_value "$1" SSL_BUILD_DIR "$2"; shift;;
+ --ssl-org) set_value "$1" SSL_ORG "$2"; shift;;
+ --ssl-orgunit) set_value "$1" SSL_ORGUNIT "$2"; shift;;
+ --ssl-common) set_value "$1" SSL_COMMON "$2"; shift;;
+ --ssl-city) set_value "$1" SSL_CITY "$2"; shift;;
+ --ssl-state) set_value "$1" SSL_STATE "$2"; shift;;
+ --ssl-country) set_value "$1" SSL_COUNTRY "$2"; shift;;
+ --ssl-email) set_value "$1" SSL_EMAIL "$2"; shift;;
+ --ssl-password) set_value "$1" SSL_PASSWORD "$2"; shift;;
+ --ssl-cname) set_value "$1"
"SSL_CNAME_PARSED[CNAME_INDEX++]=--set-cname" "$2"; shift;;
+ --install-monitoring) set_value "$1"
INSTALL_MONITORING="${2:-Y}"; shift;;
--enable-scout) ENABLE_SCOUT="${2:-1}"; shift;;
- --monitoring-parent) MONITORING_PARENT_IP="$2"; shift;;
- --monitoring-parent-ip) MONITORING_PARENT_IP="$2"; shift;;
+ --monitoring-parent) set_value "$1" MONITORING_PARENT_IP
"$2"; shift;;
+ --monitoring-parent-ip) set_value "$1" MONITORING_PARENT_IP
"$2"; shift;;
--populate-config-channel) POPULATE_CONFIG_CHANNEL="${2:-Y}"; shift;;
--start-services) START_SERVICES="${2:-Y}"; shift;;
--) shift;