Merge pull request #146 from guidotijskens/version0140

oci-utils 0.14.0-0

Author: guidotijskens

bin/oci-image-migrate

@@ -9,7 +9,8 @@
 # Infrastructure instances.  See the manual page for more information.
 
 _PY3=/usr/bin/python3
+_PY_CMD=oci_image_migrate_main.py
 s_dir=`${_PY3} -c 'import os.path ; import oci_utils.impl ; print (os.path.dirname(oci_utils.impl.__file__))' 2>/dev/null`
 
 
-exec ${_PY3}  ${s_dir}/migrate/oci-image-migrate-main.py "$@"
+exec ${_PY3}  ${s_dir}/migrate/${_PY_CMD} "$@"

bin/oci-image-migrate-import

@@ -9,7 +9,8 @@
 # Infrastructure instances.  See the manual page for more information.
 
 _PY3=/usr/bin/python3
+_PY_CMD=oci_image_migrate_import_main.py
 s_dir=`${_PY3} -c 'import os.path ; import oci_utils.impl ; print (os.path.dirname(oci_utils.impl.__file__))' 2>/dev/null`
 
 
-exec ${_PY3}  ${s_dir}/migrate/oci-image-migrate-import-main.py "$@"
+exec ${_PY3}  ${s_dir}/migrate/${_PY_CMD} "$@"

bin/oci-image-migrate-upload

@@ -9,7 +9,8 @@
 # Infrastructure instances.  See the manual page for more information.
 
 _PY3=/usr/bin/python3
+_PY_CMD=oci_image_migrate_upload_main.py
 s_dir=`${_PY3} -c 'import os.path ; import oci_utils.impl ; print (os.path.dirname(oci_utils.impl.__file__))' 2>/dev/null`
 
 
-exec ${_PY3}  ${s_dir}/migrate/oci-image-migrate-upload-main.py "$@"
+exec ${_PY3}  ${s_dir}/migrate/${_PY_CMD} "$@"

bin/oci-iscsi-config

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2022 Oracle and/or its affiliates. All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at
 # http://oss.oracle.com/licenses/upl.
 
@@ -9,6 +9,7 @@
 # Infrastructure instances.  See the manual page for more information.
 
 _PY3=/usr/bin/python3
+_PY_CMD=oci_iscsi_config_main.py
 s_dir=`${_PY3} -c 'import os.path ; import oci_utils.impl ; print (os.path.dirname(oci_utils.impl.__file__))' 2>/dev/null`
 
 declare -A IQNS
@@ -26,7 +27,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}/${_PY_CMD} "$@"
 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 -- "$@")
@@ -115,11 +116,11 @@ then
 fi
 if [ $post_operation_show -eq 1  ]
 then
-    ${_PY3} ${s_dir}/oci-iscsi-config-main.py $COMMAND ${cmd_line} --compat
+    ${_PY3} ${s_dir}/${_PY_CMD} $COMMAND ${cmd_line} --compat
     if [ $? -eq 0 ]
     then
-        exec ${_PY3} ${s_dir}/oci-iscsi-config-main.py show --compat
+        exec ${_PY3} ${s_dir}/${_PY_CMD} show --compat
     fi
 else
-  exec ${_PY3} ${s_dir}/oci-iscsi-config-main.py $COMMAND ${cmd_line} --compat
-fi
+  exec ${_PY3} ${s_dir}/${_PY_CMD} $COMMAND ${cmd_line} --compat
+fi

bin/oci-kvm

@@ -10,9 +10,10 @@
 
 
 _PY3=/usr/bin/python3
+_PY_CMD=oci_kvm_main
 s_dir=`${_PY3} -c 'import os.path ; import oci_utils.impl ; print (os.path.dirname(oci_utils.impl.__file__))' 2>/dev/null`
 
 
-exec ${_PY3}  ${s_dir}/virt/oci-kvm-main.py "$@"
+exec ${_PY3}  ${s_dir}/virt/${_PY_CMD} "$@"
 
 

bin/oci-metadata

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2022 Oracle and/or its affiliates. All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at
 # http://oss.oracle.com/licenses/upl.
 
@@ -10,9 +10,10 @@
 # Infrastructure instances.  See the manual page for more information.
 
 _PY3=/usr/bin/python3
+_PY_CMD=oci_metadata_main.py
 s_dir=`${_PY3} -c 'import os.path ; import oci_utils.impl ; print (os.path.dirname(oci_utils.impl.__file__))' 2>/dev/null`
 
 
-exec ${_PY3}  ${s_dir}/oci-metadata-main.py "$@"
+exec ${_PY3}  ${s_dir}/${_PY_CMD} "$@"
 
 

bin/oci-network-config

@@ -8,6 +8,7 @@
 # Infrastructure instances.  See the manual page for more information.
 
 _PY3=/usr/bin/python3
+_PY_CMD=oci_network_config_main.py
 s_dir=`${_PY3} -c 'import os.path ; import oci_utils.impl ; print (os.path.dirname(oci_utils.impl.__file__))' 2>/dev/null`
 
 declare COMMAND
@@ -36,10 +37,10 @@ then
   if [ $# -eq 0 ]
   then
    # former behavior : no option means '--show'
-   exec ${_PY3} ${s_dir}/oci-network-config-main.py show --compat-output
+   exec ${_PY3} ${s_dir}/${_PY_CMD} show --compat-output
   fi
    # execute as is as the command line do not start with an option dash-<something>
-   exec ${_PY3} ${s_dir}/oci-network-config-main.py $@
+   exec ${_PY3} ${s_dir}/${_PY_CMD} $@
 fi
 
 
@@ -195,12 +196,12 @@ fi
 
 if [ $post_operation_show -eq 1  ]
 then
-  ${_PY3} ${s_dir}/oci-network-config-main.py $COMMAND ${cmd_line}
+  ${_PY3} ${s_dir}/${_PY_CMD} $COMMAND ${cmd_line}
   # print things as we used to do : include system interface as table , vnic as list etc..
   if [ $? -eq 0 ]
   then
-     exec ${_PY3} ${s_dir}/oci-network-config-main.py show --compat-output
+     exec ${_PY3} ${s_dir}/${_PY_CMD} show --compat-output
   fi
 else
-  exec ${_PY3} ${s_dir}/oci-network-config-main.py $COMMAND ${cmd_line}
+  exec ${_PY3} ${s_dir}/${_PY_CMD} $COMMAND ${cmd_line}
 fi

bin/oci-network-inspector

@@ -9,7 +9,8 @@
 # Infrastructure instances.  See the manual page for more information.
 
 _PY3=/usr/bin/python3
+_PY_CMD=oci_network_inspector_main.py
 s_dir=`${_PY3} -c 'import os.path ; import oci_utils.impl ; print (os.path.dirname(oci_utils.impl.__file__))' 2>/dev/null`
 
 
-exec ${_PY3}  ${s_dir}/oci-network-inspector-main.py "$@"
+exec ${_PY3}  ${s_dir}/${_PY_CMD} "$@"

bin/oci-notify

@@ -11,13 +11,14 @@
 
 
 _PY3=/usr/bin/python3
+_PY_CMD=oci_notify_main.py
 s_dir=`${_PY3} -c 'import os.path ; import oci_utils.impl ; print (os.path.dirname(oci_utils.impl.__file__))' 2>/dev/null`
 
 declare COMMAND
 declare -A TOPICOCID
 declare -A MSGDATA
 declare -A MSGTITLE
-declare notify_exec="${s_dir}/oci-notify-main.py"
+declare notify_exec="${s_dir}/${_PY_CMD}"
 
 if [ "${1:0:1}" != '-' ]
 then

bin/oci-public-ip

@@ -11,7 +11,8 @@
 
 
 _PY3=/usr/bin/python3
+_PY_CMD=oci_public_ip_main.py
 s_dir=`${_PY3} -c 'import os.path ; import oci_utils.impl ; print (os.path.dirname(oci_utils.impl.__file__))' 2>/dev/null`
 
-exec ${_PY3}  ${s_dir}/oci-public-ip-main.py "$@"
+exec ${_PY3}  ${s_dir}/${_PY_CMD} "$@"