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/silent/scripts/pkisilent | |
| 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/silent/scripts/pkisilent')
| -rwxr-xr-x | pki/base/silent/scripts/pkisilent | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pki/base/silent/scripts/pkisilent b/pki/base/silent/scripts/pkisilent index 812cd4d78..63db49dcd 100755 --- a/pki/base/silent/scripts/pkisilent +++ b/pki/base/silent/scripts/pkisilent @@ -53,14 +53,15 @@ sub invalid_architecture() ## search order this command uses to find shared libraries. ## ############################################################################### -my $OS=`pkiname`; -my $ARCHITECTURE=`pkiarch`; +my $OS=`uname -s`; +my $ARCHITECTURE=""; chop($OS); -chop($ARCHITECTURE); if($OS eq "Linux") { + $ARCHITECTURE=`uname -i`; + chop($ARCHITECTURE); if($ARCHITECTURE eq "i386") { $libpath="/usr/lib"; @@ -95,6 +96,14 @@ if($OS eq "Linux") } elsif (${OS} eq "SunOS") { + $ARCHITECTURE=`uname -p`; + chop($ARCHITECTURE); + + if( ( ${ARCHITECTURE} eq "sparc" ) && + ( -d "/usr/lib/sparcv9/" ) ) { + $ARCHITECTURE="sparcv9"; + } + if (${ARCHITECTURE} eq "sparc") { $libpath="/usr/lib"; |