Merge pull request #139 from guidotijskens/version01250

Version01250

Author: guidotijskens

bin/oci-iscsi-config

@@ -26,7 +26,7 @@ declare -i post_operation_show=0
 if [ "${1:0:1}" != '-' ]
 then
    # execute as is as the command line do not start with an option dash-<something>
-   exec ${_PY3} ${s_dir}/oci-iscsi-config-main.py $@
+   exec ${_PY3} ${s_dir}/oci-iscsi-config-main.py "$@"
 fi
 
 PARSED_ARGUMENTS=$(getopt -a  --quiet -o sC:iAd:a:c:yf --long show,compartment:,interactive,all,detach:,attach:,create-volume:,destroy-volume:,volume-name:,username:,password:,help,yes,attach-volume,force -- "$@")
@@ -69,8 +69,14 @@ do
                               break
                               ;;
         # end of parsing , everything getopt did not understood is after that, we do not care in our case
-        --) shift; break ;;
-        *)                    COMMAND="usage"                                       ; break   ;;
+        --)
+                              if [ -z ${COMMAND} ]
+                              then
+                                COMMAND="usage"
+                              fi
+                              shift; break
+                              ;;
+        *)                    COMMAND="usage"                                                ; break   ;;
     esac
 done
 

bin/oci-network-config

@@ -175,7 +175,7 @@ then
     cmd_line="$cmd_line --ip-address=${PRIVATE_IP}"
   fi
 # else
-#  echo "_GT_ ${COMMAND} handled elsewhere"
+#  echo "GT ${COMMAND} handled elsewhere"
 fi
 
 if [ ${EXCLUDED_ITEMS[${COMMAND}]+_} ] &&  [ -n "${EXCLUDED_ITEMS[${COMMAND}]}" ]