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

34 files changed, 82 insertions, 58 deletions

diff --git a/pki/base/tps/lib/perl/PKI/Base/Conf.pm b/pki/base/tps/lib/perl/PKI/Base/Conf.pm
index 7783eb8c6..895ab28a3 100755
--- a/pki/base/tps/lib/perl/PKI/Base/Conf.pm
+++ b/pki/base/tps/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/tps/lib/perl/PKI/TPS/AdminAuthPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/AdminAuthPanel.pm
index e9a23af2a..caaf6c65f 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/AdminAuthPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/AdminAuthPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/AdminPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/AdminPanel.pm
index e75123e20..47af31018 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/AdminPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/AdminPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
@@ -166,16 +166,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/tps/lib/perl/PKI/TPS/AgentAuthPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/AgentAuthPanel.pm
index 7e8586dce..a5130caa1 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/AgentAuthPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/AgentAuthPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/AuthDBPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/AuthDBPanel.pm
index 690264578..734029bce 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/AuthDBPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/AuthDBPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
@@ -89,12 +89,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::TPS::Wizard::debug_log("AuthDBPanel: invoking $mozldap_path/ldapsearch");
     my $status = system("$mozldap_path/ldapsearch -h '$host' " .
diff --git a/pki/base/tps/lib/perl/PKI/TPS/BasePanel.pm b/pki/base/tps/lib/perl/PKI/TPS/BasePanel.pm
index 7b5e2a1b5..eecf99ff5 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/BasePanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/BasePanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm
index f91aaecc8..f17bb2bce 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/CertInfo.pm b/pki/base/tps/lib/perl/PKI/TPS/CertInfo.pm
index 957b1ba56..da5377d4f 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/CertInfo.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/CertInfo.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
@@ -89,7 +89,7 @@ sub get_nickname
     &PKI::TPS::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/tps/lib/perl/PKI/TPS/CertPrettyPrintPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/CertPrettyPrintPanel.pm
index 259bc3b30..200ef8d74 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/CertPrettyPrintPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/CertPrettyPrintPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/CertRequestPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/CertRequestPanel.pm
index f003ecc06..fb5d9ccda 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/CertRequestPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/CertRequestPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/Common.pm b/pki/base/tps/lib/perl/PKI/TPS/Common.pm
index f5d481041..d8686b6f1 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/Common.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/Common.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/Config.pm b/pki/base/tps/lib/perl/PKI/TPS/Config.pm
index 9972660e9..7195dccd9 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/Config.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/Config.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMLoginPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMLoginPanel.pm
index 36d2c4d32..5d36d3da3 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMLoginPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMLoginPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMPanel.pm
index 4c39d1821..06697a8c7 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm
index 19e70d063..f4eb27c23 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DatabasePanel.pm b/pki/base/tps/lib/perl/PKI/TPS/DatabasePanel.pm
index 95c0a1f61..c4fc7a8f8 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/DatabasePanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/DatabasePanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
@@ -116,16 +116,24 @@ sub update
       $objectclass = "organizationalUnit";
     }
 
-    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";
+        }
     }
 
     # creating database
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChain2Panel.pm b/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChain2Panel.pm
index 910b94510..3a86ab0bd 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChain2Panel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChain2Panel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm
index 74d45984a..8b6a6ed67 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DonePanel.pm b/pki/base/tps/lib/perl/PKI/TPS/DonePanel.pm
index a4d7091c4..af5d05c53 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/DonePanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/DonePanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/GlobalVar.pm b/pki/base/tps/lib/perl/PKI/TPS/GlobalVar.pm
index 7348aab68..73e7b831a 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/GlobalVar.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/GlobalVar.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm
index 2c6ac9a51..268f595eb 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/Login.pm b/pki/base/tps/lib/perl/PKI/TPS/Login.pm
index 1f67f866d..01aa01f42 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/Login.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/Login.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
@@ -91,7 +91,7 @@ package PKI::TPS::Login;
 $PKI::TPS::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/tps/lib/perl/PKI/TPS/LoginPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/LoginPanel.pm
index c57e61779..d6592d46e 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/LoginPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/LoginPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/ModulePanel.pm b/pki/base/tps/lib/perl/PKI/TPS/ModulePanel.pm
index 668165d2f..6f3510fef 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/ModulePanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/ModulePanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
@@ -48,7 +48,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/tps/lib/perl/PKI/TPS/Modutil.pm b/pki/base/tps/lib/perl/PKI/TPS/Modutil.pm
index 02d4bcad3..49c248c2e 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/Modutil.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/Modutil.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/NamePanel.pm b/pki/base/tps/lib/perl/PKI/TPS/NamePanel.pm
index 476ff75db..bed56791d 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/NamePanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/NamePanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/ReqCertInfo.pm b/pki/base/tps/lib/perl/PKI/TPS/ReqCertInfo.pm
index c96609d23..f2faee2c7 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/ReqCertInfo.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/ReqCertInfo.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm
index c422a8bcc..382072c2b 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/SizePanel.pm b/pki/base/tps/lib/perl/PKI/TPS/SizePanel.pm
index 3f21404f8..1ffda171a 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/SizePanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/SizePanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/SubsystemTypePanel.pm b/pki/base/tps/lib/perl/PKI/TPS/SubsystemTypePanel.pm
index 24307e9d2..d0dc438c0 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/SubsystemTypePanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/SubsystemTypePanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm
index 3788b4b8a..62068ff2f 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/WelcomePanel.pm b/pki/base/tps/lib/perl/PKI/TPS/WelcomePanel.pm
index 032357b4a..a1c77e7cd 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/WelcomePanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/WelcomePanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/wizard.pm b/pki/base/tps/lib/perl/PKI/TPS/wizard.pm
index a21b1d97e..328820e63 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/wizard.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/wizard.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or
@@ -90,7 +90,7 @@ package PKI::TPS::Wizard;
 $PKI::TPS::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/tps/lib/perl/Template/Velocity.pm b/pki/base/tps/lib/perl/Template/Velocity.pm
index d276a75ce..ea5eb6d72 100755
--- a/pki/base/tps/lib/perl/Template/Velocity.pm
+++ b/pki/base/tps/lib/perl/Template/Velocity.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
 # This library is free software; you can redistribute it and/or