summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRadek Novacek <rnovacek@redhat.com>2012-10-22 13:45:27 +0200
committerRadek Novacek <rnovacek@redhat.com>2012-10-22 13:45:27 +0200
commitb6917503f020b96c29c26940d50bb3f46b8edcb2 (patch)
tree4339b64ad877b44ba717e855444b661c5d06c29c
parent86a07232637625234cfa5116a96fb4602619b663 (diff)
downloadopenlmi-providers-b6917503f020b96c29c26940d50bb3f46b8edcb2.zip
openlmi-providers-b6917503f020b96c29c26940d50bb3f46b8edcb2.tar.gz
openlmi-providers-b6917503f020b96c29c26940d50bb3f46b8edcb2.tar.xz
Move registration scripts to proper directories0.0.10
register.py is renamed to openlmi-mof-register and moved to /usr/bin/, reg2pegasus is now openlmi-register-pegasus in /usr/libexec/.
-rw-r--r--CMakeLists.txt3
-rwxr-xr-xopenlmi-mof-register (renamed from register.sh)7
-rwxr-xr-x[-rw-r--r--]openlmi-register-pegasus (renamed from reg2pegasus.py)2
3 files changed, 9 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4de1a4..63bf93a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,8 @@ find_package(KonkretCMPI REQUIRED)
add_subdirectory(src)
add_subdirectory(mof)
-install(PROGRAMS register.sh reg2pegasus.py DESTINATION share/openlmi-providers)
+install(PROGRAMS openlmi-mof-register DESTINATION bin)
+install(PROGRAMS openlmi-register-pegasus DESTINATION libexec)
install(FILES cmake/modules/OpenLMIMacros.cmake DESTINATION share/cmake/Modules)
install(FILES cmake/modules/FindCMPI.cmake DESTINATION share/cmake/Modules)
install(FILES cmake/modules/FindKonkretCMPI.cmake DESTINATION share/cmake/Modules)
diff --git a/register.sh b/openlmi-mof-register
index f94869b..7a9aaa4 100755
--- a/register.sh
+++ b/openlmi-mof-register
@@ -29,7 +29,12 @@ function register()
fi
$CIMMOF -uc $mof
- cat $reg | /usr/bin/python2 $(dirname $0)/reg2pegasus.py | $CIMMOF -uc -n root/PG_Interop -
+ if [ -x $(dirname $0)/openlmi-register-pegasus ];
+ then
+ cat $reg | $(dirname $0)/openlmi-register-pegasus | $CIMMOF -uc -n root/PG_Interop -
+ else
+ cat $reg | /usr/libexec/openlmi-register-pegasus | $CIMMOF -uc -n root/PG_Interop -
+ fi
fi
}
diff --git a/reg2pegasus.py b/openlmi-register-pegasus
index c9e6b32..6f33634 100644..100755
--- a/reg2pegasus.py
+++ b/openlmi-register-pegasus
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
import sys
import re