diff options
author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-11-07 02:07:44 +0000 |
---|---|---|
committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-11-07 02:07:44 +0000 |
commit | 551ac1bf0836ec7ee873be112fe2beb4fb799a5a (patch) | |
tree | 7c420ef1a92c8a4692b8eb53bbb8ad004c4d6fae /pki/base/ra | |
parent | 8b7fac3f033143cd6bf53d94be8c398982a3af21 (diff) | |
download | pki-551ac1bf0836ec7ee873be112fe2beb4fb799a5a.tar.gz pki-551ac1bf0836ec7ee873be112fe2beb4fb799a5a.tar.xz pki-551ac1bf0836ec7ee873be112fe2beb4fb799a5a.zip |
Bugzilla Bug #533233 - Remove "pki*" scripts from pki-native-tools . . .
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@812 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/ra')
37 files changed, 103 insertions, 82 deletions
diff --git a/pki/base/ra/apache/apachectl b/pki/base/ra/apache/apachectl index d5474740..7d9e2449 100755 --- a/pki/base/ra/apache/apachectl +++ b/pki/base/ra/apache/apachectl @@ -27,7 +27,7 @@ LD_LIBRARY_PATH=[SECURITY_LIBRARIES]:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH # see if httpd is linked with the openldap libraries - we need to override them -OS=`pkiname` +OS=`uname -s` if [ $OS = "Linux" ]; then hasopenldap=0 diff --git a/pki/base/ra/etc/init.d/httpd b/pki/base/ra/etc/init.d/httpd index 40b55108..4f18cd13 100755 --- a/pki/base/ra/etc/init.d/httpd +++ b/pki/base/ra/etc/init.d/httpd @@ -38,26 +38,17 @@ if [ $? -ne 0 ] ; then exit 255 fi -# Check to insure that at least one PKI subsystem -# currently resides on this system. -if [ ! -x /usr/bin/pkiarch ] || - [ ! -x /usr/bin/pkiflavor ] || - [ ! -x /usr/bin/pkiname ]; then - echo "This machine is missing all PKI subsystems!" - exit 255 -fi - # Check to insure that this script's associated PKI # subsystem currently resides on this system. SUBSYSTEM_TYPE=[SUBSYSTEM_TYPE] -if [ ! -d /usr/share/`pkiflavor`/${SUBSYSTEM_TYPE} ] ; then +if [ ! -d /usr/share/pki/${SUBSYSTEM_TYPE} ] ; then echo "This machine is missing the '${SUBSYSTEM_TYPE}' subsystem!" exit 255 fi # Obtain the operating system upon which this script is being executed -OS=`pkiname` -ARCHITECTURE=`pkiarch` +OS=`uname -s` +ARCHITECTURE="" # Time to wait in seconds, before killing process # @@ -73,11 +64,17 @@ if [ ${OS} = "Linux" ] ; then echo "Must be 'root' to execute '$0'!" exit 1 fi + ARCHITECTURE=`uname -i` elif [ ${OS} = "SunOS" ] ; then if [ `/usr/xpg4/bin/id -u` -ne 0 ] ; then echo "Must be 'root' to execute '$0'!" exit 1 fi + ARCHITECTURE=`uname -p` + if [ "${ARCHITECTURE}" = "sparc" ] && + [ -d "/usr/lib/sparcv9/" ] ; then + ARCHITECTURE="sparcv9" + fi else echo "Unsupported OS '${OS}'!" exit 1 diff --git a/pki/base/ra/lib/perl/PKI/Base/Conf.pm b/pki/base/ra/lib/perl/PKI/Base/Conf.pm index 7783eb8c..895ab28a 100755 --- a/pki/base/ra/lib/perl/PKI/Base/Conf.pm +++ b/pki/base/ra/lib/perl/PKI/Base/Conf.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/lib/perl/PKI/RA/AdminAuthPanel.pm b/pki/base/ra/lib/perl/PKI/RA/AdminAuthPanel.pm index 4c30859c..656dc2d5 100755 --- a/pki/base/ra/lib/perl/PKI/RA/AdminAuthPanel.pm +++ b/pki/base/ra/lib/perl/PKI/RA/AdminAuthPanel.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/lib/perl/PKI/RA/AdminPanel.pm b/pki/base/ra/lib/perl/PKI/RA/AdminPanel.pm index e0803291..6cf1c69c 100755 --- a/pki/base/ra/lib/perl/PKI/RA/AdminPanel.pm +++ b/pki/base/ra/lib/perl/PKI/RA/AdminPanel.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify @@ -168,16 +168,24 @@ sub update my $tmp = "/tmp/addAgents-$$.ldif"; - my $flavor = `pkiflavor`; + my $flavor = "pki"; $flavor =~ s/\n//g; my $mozldap_path = "/usr/lib/mozldap"; - my $arch = `pkiarch`; - $arch =~ s/\n//g; - if ($arch eq "x86_64") { - $mozldap_path = "/usr/lib64/mozldap"; - } elsif ($arch eq "sparcv9") { - $mozldap_path = "/usr/lib/sparcv9/mozldap6"; + my $arch = ""; + if ($^O eq "linux") { + $arch = `uname -i`; + $arch =~ s/\n//g; + if ($arch eq "x86_64") { + $mozldap_path = "/usr/lib64/mozldap"; + } + } elsif ($^O eq "solaris") { + $arch=`uname -p`; + $arch =~ s/\n//g; + if( ( $arch eq "sparc" ) && + ( -d "/usr/lib/sparcv9/" ) ) { + $mozldap_path = "/usr/lib/sparcv9/mozldap6"; + } } # $admincert =~ s/\//\\\//g; diff --git a/pki/base/ra/lib/perl/PKI/RA/AgentAuthPanel.pm b/pki/base/ra/lib/perl/PKI/RA/AgentAuthPanel.pm index 257b925a..1ada5ad5 100755 --- a/pki/base/ra/lib/perl/PKI/RA/AgentAuthPanel.pm +++ b/pki/base/ra/lib/perl/PKI/RA/AgentAuthPanel.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/lib/perl/PKI/RA/AuthDBPanel.pm b/pki/base/ra/lib/perl/PKI/RA/AuthDBPanel.pm index 9442035a..0be17a38 100755 --- a/pki/base/ra/lib/perl/PKI/RA/AuthDBPanel.pm +++ b/pki/base/ra/lib/perl/PKI/RA/AuthDBPanel.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify @@ -90,12 +90,20 @@ sub update # try to do a ldapsearch my $tmp = "/tmp/file$$"; my $mozldap_path = "/usr/lib/mozldap"; - my $arch = `pkiarch`; - $arch =~ s/\n//g; - if ($arch eq "x86_64") { - $mozldap_path = "/usr/lib64/mozldap"; - } elsif ($arch eq "sparcv9") { - $mozldap_path = "/usr/lib/sparcv9/mozldap6"; + my $arch = ""; + if ($^O eq "linux") { + $arch = `uname -i`; + $arch =~ s/\n//g; + if ($arch eq "x86_64") { + $mozldap_path = "/usr/lib64/mozldap"; + } + } elsif ($^O eq "solaris") { + $arch=`uname -p`; + $arch =~ s/\n//g; + if( ( $arch eq "sparc" ) && + ( -d "/usr/lib/sparcv9/" ) ) { + $mozldap_path = "/usr/lib/sparcv9/mozldap6"; + } } &PKI::RA::Wizard::debug_log("AuthDBPanel: invoking $mozldap_path/ldapsearch"); my $status = system("$mozldap_path/ldapsearch -h '$host' " . diff --git a/pki/base/ra/lib/perl/PKI/RA/BasePanel.pm b/pki/base/ra/lib/perl/PKI/RA/BasePanel.pm index 09b1d4b7..5cb4d769 100755 --- a/pki/base/ra/lib/perl/PKI/RA/BasePanel.pm +++ b/pki/base/ra/lib/perl/PKI/RA/BasePanel.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/lib/perl/PKI/RA/CAInfoPanel.pm b/pki/base/ra/lib/perl/PKI/RA/CAInfoPanel.pm index d06e3dac..7e20e222 100755 --- a/pki/base/ra/lib/perl/PKI/RA/CAInfoPanel.pm +++ b/pki/base/ra/lib/perl/PKI/RA/CAInfoPanel.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/lib/perl/PKI/RA/CertInfo.pm b/pki/base/ra/lib/perl/PKI/RA/CertInfo.pm index e4cc6328..d1a8c381 100755 --- a/pki/base/ra/lib/perl/PKI/RA/CertInfo.pm +++ b/pki/base/ra/lib/perl/PKI/RA/CertInfo.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify @@ -90,7 +90,7 @@ sub get_nickname &PKI::RA::Wizard::debug_log("CertInfo: get_nickname"); my $nickname = $::config->get("preop.cert.$self->{tag}.nickname"); - my $flavor = `pkiflavor`; + my $flavor = "pki"; $flavor =~ s/\n//g; if ($nickname ne "") { diff --git a/pki/base/ra/lib/perl/PKI/RA/CertPrettyPrintPanel.pm b/pki/base/ra/lib/perl/PKI/RA/CertPrettyPrintPanel.pm index c7eee388..cf58d232 100755 --- a/pki/base/ra/lib/perl/PKI/RA/CertPrettyPrintPanel.pm +++ b/pki/base/ra/lib/perl/PKI/RA/CertPrettyPrintPanel.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/lib/perl/PKI/RA/CertRequestPanel.pm b/pki/base/ra/lib/perl/PKI/RA/CertRequestPanel.pm index ab58610e..51eb1d40 100755 --- a/pki/base/ra/lib/perl/PKI/RA/CertRequestPanel.pm +++ b/pki/base/ra/lib/perl/PKI/RA/CertRequestPanel.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/lib/perl/PKI/RA/Common.pm b/pki/base/ra/lib/perl/PKI/RA/Common.pm index 40b0bd6b..8deab8c6 100755 --- a/pki/base/ra/lib/perl/PKI/RA/Common.pm +++ b/pki/base/ra/lib/perl/PKI/RA/Common.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/lib/perl/PKI/RA/Config.pm b/pki/base/ra/lib/perl/PKI/RA/Config.pm index 6dab970b..f1ace5b0 100755 --- a/pki/base/ra/lib/perl/PKI/RA/Config.pm +++ b/pki/base/ra/lib/perl/PKI/RA/Config.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/lib/perl/PKI/RA/ConfigHSMLoginPanel.pm b/pki/base/ra/lib/perl/PKI/RA/ConfigHSMLoginPanel.pm index 87e85dc5..bf74890c 100755 --- a/pki/base/ra/lib/perl/PKI/RA/ConfigHSMLoginPanel.pm +++ b/pki/base/ra/lib/perl/PKI/RA/ConfigHSMLoginPanel.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/lib/perl/PKI/RA/ConfigHSMPanel.pm b/pki/base/ra/lib/perl/PKI/RA/ConfigHSMPanel.pm index ed39cec0..095ed587 100755 --- a/pki/base/ra/lib/perl/PKI/RA/ConfigHSMPanel.pm +++ b/pki/base/ra/lib/perl/PKI/RA/ConfigHSMPanel.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/lib/perl/PKI/RA/DRMInfoPanel.pm b/pki/base/ra/lib/perl/PKI/RA/DRMInfoPanel.pm index 924fe0cb..fadd7727 100755 --- a/pki/base/ra/lib/perl/PKI/RA/DRMInfoPanel.pm +++ b/pki/base/ra/lib/perl/PKI/RA/DRMInfoPanel.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/lib/perl/PKI/RA/DatabasePanel.pm b/pki/base/ra/lib/perl/PKI/RA/DatabasePanel.pm index fe37de72..e469e51f 100755 --- a/pki/base/ra/lib/perl/PKI/RA/DatabasePanel.pm +++ b/pki/base/ra/lib/perl/PKI/RA/DatabasePanel.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/lib/perl/PKI/RA/DisplayCertChain2Panel.pm b/pki/base/ra/lib/perl/PKI/RA/DisplayCertChain2Panel.pm index 5d209e06..46c8a290 100755 --- a/pki/base/ra/lib/perl/PKI/RA/DisplayCertChain2Panel.pm +++ b/pki/base/ra/lib/perl/PKI/RA/DisplayCertChain2Panel.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/lib/perl/PKI/RA/DisplayCertChainPanel.pm b/pki/base/ra/lib/perl/PKI/RA/DisplayCertChainPanel.pm index 6c691eeb..7789aaab 100755 --- a/pki/base/ra/lib/perl/PKI/RA/DisplayCertChainPanel.pm +++ b/pki/base/ra/lib/perl/PKI/RA/DisplayCertChainPanel.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/lib/perl/PKI/RA/DonePanel.pm b/pki/base/ra/lib/perl/PKI/RA/DonePanel.pm index 87af739d..c76f35c9 100755 --- a/pki/base/ra/lib/perl/PKI/RA/DonePanel.pm +++ b/pki/base/ra/lib/perl/PKI/RA/DonePanel.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/lib/perl/PKI/RA/GlobalVar.pm b/pki/base/ra/lib/perl/PKI/RA/GlobalVar.pm index bf7fae60..388a4134 100755 --- a/pki/base/ra/lib/perl/PKI/RA/GlobalVar.pm +++ b/pki/base/ra/lib/perl/PKI/RA/GlobalVar.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/lib/perl/PKI/RA/ImportAdminCertPanel.pm b/pki/base/ra/lib/perl/PKI/RA/ImportAdminCertPanel.pm index 80cbd523..4ab51f1b 100755 --- a/pki/base/ra/lib/perl/PKI/RA/ImportAdminCertPanel.pm +++ b/pki/base/ra/lib/perl/PKI/RA/ImportAdminCertPanel.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/lib/perl/PKI/RA/Login.pm b/pki/base/ra/lib/perl/PKI/RA/Login.pm index efd88827..875df1a3 100755 --- a/pki/base/ra/lib/perl/PKI/RA/Login.pm +++ b/pki/base/ra/lib/perl/PKI/RA/Login.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify @@ -92,7 +92,7 @@ package PKI::RA::Login; $PKI::RA::Login::VERSION = '1.00'; # read configuration file -my $flavor = `pkiflavor`; +my $flavor = "pki"; $flavor =~ s/\n//g; my $pkiroot = $ENV{PKI_ROOT}; diff --git a/pki/base/ra/lib/perl/PKI/RA/LoginPanel.pm b/pki/base/ra/lib/perl/PKI/RA/LoginPanel.pm index 21112740..66f40acf 100755 --- a/pki/base/ra/lib/perl/PKI/RA/LoginPanel.pm +++ b/pki/base/ra/lib/perl/PKI/RA/LoginPanel.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/lib/perl/PKI/RA/ModulePanel.pm b/pki/base/ra/lib/perl/PKI/RA/ModulePanel.pm index 955c054b..87ce056b 100755 --- a/pki/base/ra/lib/perl/PKI/RA/ModulePanel.pm +++ b/pki/base/ra/lib/perl/PKI/RA/ModulePanel.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify @@ -49,7 +49,7 @@ sub new { $self->{"update"} = \&update; $self->{"panelvars"} = \&display; - my $flavor = `pkiflavor`; + my $flavor = "pki"; $flavor =~ s/\n//g; my $pkiroot = $ENV{PKI_ROOT}; diff --git a/pki/base/ra/lib/perl/PKI/RA/Modutil.pm b/pki/base/ra/lib/perl/PKI/RA/Modutil.pm index 017978ba..82c66e87 100755 --- a/pki/base/ra/lib/perl/PKI/RA/Modutil.pm +++ b/pki/base/ra/lib/perl/PKI/RA/Modutil.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/lib/perl/PKI/RA/NamePanel.pm b/pki/base/ra/lib/perl/PKI/RA/NamePanel.pm index 221f9326..124d2f4b 100755 --- a/pki/base/ra/lib/perl/PKI/RA/NamePanel.pm +++ b/pki/base/ra/lib/perl/PKI/RA/NamePanel.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/lib/perl/PKI/RA/ReqCertInfo.pm b/pki/base/ra/lib/perl/PKI/RA/ReqCertInfo.pm index 75fba5c4..51c22cd2 100755 --- a/pki/base/ra/lib/perl/PKI/RA/ReqCertInfo.pm +++ b/pki/base/ra/lib/perl/PKI/RA/ReqCertInfo.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm b/pki/base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm index 857f3a97..eb2631a9 100755 --- a/pki/base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm +++ b/pki/base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/lib/perl/PKI/RA/SizePanel.pm b/pki/base/ra/lib/perl/PKI/RA/SizePanel.pm index 3a1ba77d..f55dc41e 100755 --- a/pki/base/ra/lib/perl/PKI/RA/SizePanel.pm +++ b/pki/base/ra/lib/perl/PKI/RA/SizePanel.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/lib/perl/PKI/RA/SubsystemTypePanel.pm b/pki/base/ra/lib/perl/PKI/RA/SubsystemTypePanel.pm index 4a086942..3d946bca 100755 --- a/pki/base/ra/lib/perl/PKI/RA/SubsystemTypePanel.pm +++ b/pki/base/ra/lib/perl/PKI/RA/SubsystemTypePanel.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/lib/perl/PKI/RA/TKSInfoPanel.pm b/pki/base/ra/lib/perl/PKI/RA/TKSInfoPanel.pm index 6a4f6b16..ddf1124a 100755 --- a/pki/base/ra/lib/perl/PKI/RA/TKSInfoPanel.pm +++ b/pki/base/ra/lib/perl/PKI/RA/TKSInfoPanel.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/lib/perl/PKI/RA/WelcomePanel.pm b/pki/base/ra/lib/perl/PKI/RA/WelcomePanel.pm index 43935530..c88c138b 100755 --- a/pki/base/ra/lib/perl/PKI/RA/WelcomePanel.pm +++ b/pki/base/ra/lib/perl/PKI/RA/WelcomePanel.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/lib/perl/PKI/RA/wizard.pm b/pki/base/ra/lib/perl/PKI/RA/wizard.pm index f6038de4..ecfe6dd3 100755 --- a/pki/base/ra/lib/perl/PKI/RA/wizard.pm +++ b/pki/base/ra/lib/perl/PKI/RA/wizard.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify @@ -89,7 +89,7 @@ package PKI::RA::Wizard; $PKI::RA::Wizard::VERSION = '1.00'; # read configuration file -my $flavor = `pkiflavor`; +my $flavor = "pki"; $flavor =~ s/\n//g; my $pkiroot = $ENV{PKI_ROOT}; diff --git a/pki/base/ra/lib/perl/Template/Velocity.pm b/pki/base/ra/lib/perl/Template/Velocity.pm index cbfe8a58..848de65f 100755 --- a/pki/base/ra/lib/perl/Template/Velocity.pm +++ b/pki/base/ra/lib/perl/Template/Velocity.pm @@ -1,4 +1,4 @@ -#!/usr/bin/pkiperl +#!/usr/bin/perl # # --- BEGIN COPYRIGHT BLOCK --- # This program is free software; you can redistribute it and/or modify diff --git a/pki/base/ra/scripts/nss_pcache b/pki/base/ra/scripts/nss_pcache index 3e67881b..bf978b48 100755 --- a/pki/base/ra/scripts/nss_pcache +++ b/pki/base/ra/scripts/nss_pcache @@ -30,28 +30,36 @@ if [ $? -ne 0 ] ; then exit 255 fi -PLATFORM=`pkiarch` +OS=`uname -s` -if [ $PLATFORM = "i386" ]; then - # 32-bit Linux - LD_LIBRARY_PATH=/usr/lib/dirsec:/usr/lib:$LD_LIBRARY_PATH -elif [ $PLATFORM = "x86_64" ]; then - # 64-bit Linux - LD_LIBRARY_PATH=/usr/lib64/dirsec:/usr/lib64:/usr/lib:$LD_LIBRARY_PATH -elif [ $PLATFORM = "sparc" ]; then - # 32-bit Solaris - LD_LIBRARY_PATH=/usr/lib/dirsec:/usr/lib:$LD_LIBRARY_PATH -elif [ $PLATFORM = "sparcv9" ]; then - # 64-bit Solaris - LD_LIBRARY_PATH=/usr/lib/sparcv9/dirsec:/usr/lib/sparcv9:/usr/lib/dirsec:/usr/lib:$LD_LIBRARY_PATH +if [ $OS = "Linux" ]; then + PLATFORM=`uname -i` + if [ $PLATFORM = "i386" ]; then + # 32-bit Linux + LD_LIBRARY_PATH=/usr/lib/dirsec:/usr/lib:$LD_LIBRARY_PATH + elif [ $PLATFORM = "x86_64" ]; then + # 64-bit Linux + LD_LIBRARY_PATH=/usr/lib64/dirsec:/usr/lib64:/usr/lib:$LD_LIBRARY_PATH + fi + export LD_LIBRARY_PATH +elif [ $OS = "SunOS" ]; then + PLATFORM=`uname -p` + if [ "${PLATFORM}" = "sparc" ] && + [ -d "/usr/lib/sparcv9/" ] ; then + PLATFORM="sparcv9" + fi + if [ $PLATFORM = "sparc" ]; then + # 32-bit Solaris + LD_LIBRARY_PATH=/usr/lib/dirsec:/usr/lib:$LD_LIBRARY_PATH + elif [ $PLATFORM = "sparcv9" ]; then + # 64-bit Solaris + LD_LIBRARY_PATH=/usr/lib/sparcv9/dirsec:/usr/lib/sparcv9:/usr/lib/dirsec:/usr/lib:$LD_LIBRARY_PATH + fi + export LD_LIBRARY_PATH fi -export LD_LIBRARY_PATH -DIST=`pkidist` FORTITUDE_DIR=/usr/sbin -if [ $DIST = "el4" ]; then - FORTITUDE_DIR=/opt/fortitude/bin -elif [ $DIST = "sol9" ]; then +if [ $OS = "SunOS" ]; then FORTITUDE_DIR=/opt/fortitude/bin fi |