Attachment 693398 Details for Bug 896125 – Patch - bz896125

[patch] Patch - bz896125

0001-bz896125-configure-proxy.sh-does-not-handle-appropri.patch (text/plain), 5.94 KB, created by Dimitar Yordanov on 2013-02-05 14:51:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitar Yordanov

Created: 2013-02-05 14:51:23 UTC

Size: 5.94 KB

patch

obsolete

>From f853addaaf79a34ad173ef7a995b7937b64342ad Mon Sep 17 00:00:00 2001
>From: Dimitar Yordanov <dyordano@redhat.com>
>Date: Tue, 5 Feb 2013 15:43:32 +0100
>Subject: [PATCH] bz896125 - configure-proxy.sh does not handle appropriately
> wrong options
>
>---
> proxy/installer/configure-proxy.sh |   94 ++++++++++++++++++++++--------------
> 1 files changed, 57 insertions(+), 37 deletions(-)
>
>diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh
>index bdfe3c3..735af26 100755
>--- a/proxy/installer/configure-proxy.sh
>+++ b/proxy/installer/configure-proxy.sh
>@@ -80,57 +80,77 @@ HELP
> }
> 
> parse_answer_file () {
>-    local FILE="$1"
>+
>+    [[ ${1} =~ ^- ]] && echo "Error: Option --answer-file requires argument!"  && exit 1
>+    
>+    local FILE="${1}"
>     local ALIAS
>-    . "$FILE"
>+    . ${1}
>     for ALIAS in ${SSL_CNAME[@]}; do
>         SSL_CNAME_PARSED[CNAME_INDEX++]=--set-cname=$ALIAS
>     done
> }
> 
>+set_value() {
>+ 
>+  [[ ${2} =~ ^- ]] && echo "Error: Option ${3} requires argument!"  && exit 1
>+  eval "${1}=${2}"
>+}
>+
> INTERACTIVE=1
> CNAME_INDEX=0
> 
>-OPTS=$(getopt --longoptions=help,answer-file:,non-interactive,version:,rhn-parent:,traceback-email:,use-ssl:,ca-chain:,force-own-ca,http-proxy:,http-username:,http-password:,ssl-build-dir:,ssl-org:,ssl-orgunit:,ssl-common:,ssl-city:,ssl-state:,ssl-country:,ssl-email:,ssl-password:,ssl-cname:,install-monitoring:,enable-scout:,monitoring-parent:,monitoring-parent-ip:,populate-config-channel:,start-services: -n ${0##*/} -- h "$@")
> 
>-if [ $? != 0 ] ; then
>-        print_help
>-fi
>+PARAMS=$( getopt  -n$0 -u -a --longoptions="help answer-file:  non-interactive \
>+                                         version:  rhn-parent: traceback-email: \
>+                                         use-ssl:  ca-chain: force-own-ca \
>+                                         http-proxy: http-username: http-password: \
>+                                         ssl-build-dir: ssl-org: ssl-orgunit: \
>+                                         ssl-common: ssl-city: ssl-state: \
>+                                         ssl-country: ssl-email: ssl-password: \
>+                                         ssl-cname: install-monitoring: enable-scout: \
>+                                         monitoring-parent: monitoring-parent-ip: populate-config-channel: \
>+                                         start-services:" "h" "$@" )
>+
>+
>+[[ $? -ne 0 ]] && print_help || set -- ${PARAMS}
> 
>-eval set -- "$OPTS"
> 
>-while : ; do
>-    case "$1" in
>-        --help|-h)  print_help;;
>-        --answer-file) parse_answer_file "$2"; shift;;
>+while [ $# -gt 0 ]; do
>+    case $1 in
>+        --help | -h)  print_help;;
>+        --answer-file) parse_answer_file ${2};shift;;
>         --non-interactive) INTERACTIVE=0;;
>-        --version) VERSION=$2; shift;;
>-        --rhn-parent) RHN_PARENT="$2"; shift;;
>-        --traceback-email) TRACEBACK_EMAIL="$2"; shift;;
>-        --use-ssl) USE_SSL="$2"; shift;;
>-        --ca-chain) CA_CHAIN="$2"; shift;;
>+        --version) set_value VERSION ${2} ${1};shift;;
>+        --rhn-parent) set_value RHN_PARENT ${2} ${1};shift;;
>+        --traceback-email) set_value TRACEBACK_EMAIL ${2} ${1};shift;;
>+        --use-ssl) set_value USE_SSL ${2} ${1};shift;;
>+        --ca-chain) set_value CA_CHAIN ${2} ${1};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"; shift;;
>-        --enable-scout) ENABLE_SCOUT="$2"; shift;;
>-        --monitoring-parent) MONITORING_PARENT_IP="$2"; shift;;
>-        --monitoring-parent-ip) MONITORING_PARENT_IP="$2"; shift;;
>-        --populate-config-channel) POPULATE_CONFIG_CHANNEL="$2"; shift;;
>-        --start-services) START_SERVICES="$2"; shift;;
>-        --) shift; break;;
>-        *) echo Error: Invalid option $1; exit 1;;
>+        --http-proxy) set_value HTTP_PROXY ${2} ${1};shift;;
>+        --http-username) set_value HTTP_USERNAME ${2} ${1};shift;;
>+        --http-password) set_value HTTP_PASSWORD ${2} ${1};shift;;
>+        --ssl-build-dir) set_value SSL_BUILD_DIR ${2} ${1};shift;;
>+        --ssl-org) set_value SSL_ORG ${2} ${1};shift;;
>+        --ssl-orgunit) set_value SSL_ORGUNIT ${2} ${1};shift;;
>+        --ssl-common) set_value SSL_COMMON ${2} ${1};shift;;
>+        --ssl-city) set_value SSL_CITY ${2} ${1};shift;;
>+        --ssl-state) set_value SSL_STATE ${2} ${1};shift;;
>+        --ssl-country) set_value SSL_COUNTRY ${2} ${1};shift;;
>+        --ssl-email) set_value SSL_EMAIL ${2} ${1};shift;;
>+        --ssl-password) set_value SSL_PASSWORD ${2} ${1};shift;;
>+        --ssl-cname) set_value SSL_CNAME ${2} ${1}; SSL_CNAME_PARSED[CNAME_INDEX++]=--set-cname=${SSL_CNAME};shift;;
>+        --install-monitoring) set_value INSTALL_MONITORING ${2} ${1};shift;;
>+        --enable-scout) set_value ENABLE_SCOUT ${2} ${1};shift;;
>+        --monitoring-parent) set_value MONITORING_PARENT_IP ${2} ${1};shift;;
>+        --monitoring-parent-ip) set_value MONITORING_PARENT_IP ${2} ${1};shift;;
>+        --populate-config-channel) set_value POPULATE_CONFIG_CHANNEL ${2} ${1};shift;;
>+        --start-services) set_value START_SERVICES ${2} ${1};shift;;
>+        --)        shift;
>+                   [[ $# -gt 0 ]] && echo "Error: Extra string(s) was/were found: $@" && exit 1
>+                   break;;
>+        #-*)        print_help;;
>+        #*)         print_help;;
>     esac
>     shift
> done
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 896125: 693398