diff options
| author | jdennis <jdennis@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-11-19 21:44:17 +0000 |
|---|---|---|
| committer | jdennis <jdennis@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-11-19 21:44:17 +0000 |
| commit | 062547f6158bf38939e0a2f4c5e8342efd0f6004 (patch) | |
| tree | 61bbff3882846507e72a128f84937b0949f1f209 /pki/base | |
| parent | 1ce12b22e224af364d62c12b690a59b5cd10851b (diff) | |
| download | pki-062547f6158bf38939e0a2f4c5e8342efd0f6004.tar.gz pki-062547f6158bf38939e0a2f4c5e8342efd0f6004.tar.xz pki-062547f6158bf38939e0a2f4c5e8342efd0f6004.zip | |
Rename pkicommon to pkicommon.pm
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1578 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base')
| -rw-r--r-- | pki/base/setup/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | pki/base/setup/build.xml | 12 | ||||
| -rwxr-xr-x | pki/base/setup/pkicommon.pm (renamed from pki/base/setup/pkicommon) | 0 | ||||
| -rwxr-xr-x | pki/base/setup/pkihost | 26 |
4 files changed, 9 insertions, 31 deletions
diff --git a/pki/base/setup/CMakeLists.txt b/pki/base/setup/CMakeLists.txt index 3eda37ae1..d46b22f28 100644 --- a/pki/base/setup/CMakeLists.txt +++ b/pki/base/setup/CMakeLists.txt @@ -15,7 +15,7 @@ install( install( FILES - pkicommon + pkicommon.pm DESTINATION ${DATA_INSTALL_DIR}/scripts/ PERMISSIONS diff --git a/pki/base/setup/build.xml b/pki/base/setup/build.xml index ce34b4f38..4d446b9af 100644 --- a/pki/base/setup/build.xml +++ b/pki/base/setup/build.xml @@ -146,7 +146,7 @@ <zipfileset dir="." filemode="755" prefix="usr/share/${product.prefix}/scripts"> - <include name="pkicommon"/> + <include name="pkicommon.pm"/> </zipfileset> <zipfileset dir="." filemode="644" @@ -170,7 +170,7 @@ <tarfileset dir="." mode="755" prefix="${dist.name}/usr/share/${product.prefix}/scripts"> - <include name="pkicommon"/> + <include name="pkicommon.pm"/> </tarfileset> <tarfileset dir="." mode="644" @@ -224,7 +224,7 @@ <include name="build.xml"/> <include name="config/product*.xml"/> <include name="config/release*.xml"/> - <exclude name="pkicommon"/> + <exclude name="pkicommon.pm"/> <exclude name="pkicreate"/> <exclude name="pkihost"/> <exclude name="pkiremove"/> @@ -233,7 +233,7 @@ <zipfileset dir="." filemode="755" prefix="${src.dist.name}"> - <include name="pkicommon"/> + <include name="pkicommon.pm"/> <include name="pkicreate"/> <include name="pkihost"/> <include name="pkiremove"/> @@ -253,7 +253,7 @@ <include name="build.xml"/> <include name="config/product*.xml"/> <include name="config/release*.xml"/> - <exclude name="pkicommon"/> + <exclude name="pkicommon.pm"/> <exclude name="pkicreate"/> <exclude name="pkihost"/> <exclude name="pkiremove"/> @@ -262,7 +262,7 @@ <tarfileset dir="." mode="755" prefix="${src.dist.name}"> - <include name="pkicommon"/> + <include name="pkicommon.pm"/> <include name="pkicreate"/> <include name="pkihost"/> <include name="pkiremove"/> diff --git a/pki/base/setup/pkicommon b/pki/base/setup/pkicommon.pm index b8aa95939..b8aa95939 100755 --- a/pki/base/setup/pkicommon +++ b/pki/base/setup/pkicommon.pm diff --git a/pki/base/setup/pkihost b/pki/base/setup/pkihost index 058d42db1..21c9994d5 100755 --- a/pki/base/setup/pkihost +++ b/pki/base/setup/pkihost @@ -98,30 +98,8 @@ if( $^O eq "linux" ) { $pki_flavor =~ s/\s+$//g; -# Establish path to scripts -my $pki_subsystem_common_area = "/usr/share/$pki_flavor"; -my $common_path = "/usr/share/pki/scripts"; - -if( ! -d "$common_path" ) { - print( STDERR - "ERROR: The path '$common_path' does not exist!\n" - . " Unable to load shared Common Perl Data " - . "and Subroutines!\n" ); - print( STDOUT "\n" ); - exit 255; -} - -if( ! -e "$common_path/pkicommon" ) { - print( STDERR - "ERROR: The file '$common_path/pkicommon' does not exist!\n" - . " Unable to load shared Common Perl Data " - . "and Subroutines!\n" ); - print( STDOUT "\n" ); - exit 255; -} - -eval( "use lib '" . $common_path . "'" ); -require( 'pkicommon' ); +use lib "/usr/share/pki/scripts"; +use pkicommon; # make -w happy by suppressing warnings of Global variables used only once my $suppress = ""; |