Modify setup-openssh.pl to call metadata and add pkgdata for the gpt setup

bundle.

diff --git a/setup/pkg_data_src.gpt b/setup/pkg_data_src.gpt
new file mode 100644 (file)
index 0000000..94b81a2
--- /dev/null
+++ b/setup/pkg_data_src.gpt
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE gpt_package_metadata SYSTEM "package.dtd">
+
+<gpt_package_metadata Format_Version="0.01" Name="gsi-openssh-setup" >
+
+  <Aging_Version Age="0" Major="0" Minor="1" />
+  <Description>GSI binary package openssh version 3.0.2p1 with patches (setup)</Description>
+  <Functional_Group >gsi-openssh</Functional_Group>
+  <Version_Stability Release="alpha" />
+
+  <src_pkg >
+
+    <Version_Label>3.0.2p1</Version_Label>
+
+    <Build_Instructions>
+
+      <COMMENT> what happens if INSTALLDIR_GPTMACRO/setup doesn't exist? </COMMENT>
+      <Build_Step>cp setup-openssh INSTALLDIR_GPTMACRO/setup/setup-openssh</Build_Step>
+      <Build_Step>cp setup-openssh.pl INSTALLDIR_GPTMACRO/setup/setup-openssh.pl</Build_Step>
+
+    </Build_Instructions>
+
+    <Post_Install_Program >
+      setup-openssh
+    </Post_Install_Program>
+
+    <Post_Install_Message >
+      You need to run setup-openssh
+    </Post_Install_Message>
+
+    <Setup Name="gsi-openssh-setup">
+      <Aging_Version Age="0" Major="1" Minor="0" />
+    </Setup>
+
+  </src_pkg >
+
+</gpt_package_metadata>

diff --git a/setup/setup-openssh.pl b/setup/setup-openssh.pl
index 9e67f03c790f22c55d43ec481cf70d2839d15137..639c3c113f685272b2e15fc2dcd85cd28af76193 100644 (file)
--- a/setup/setup-openssh.pl
+++ b/setup/setup-openssh.pl
@@ -6,14 +6,14 @@
 # adapted from 'fixpath', located in the openssh-3.0.2p1 package
 #
 
-my $gpath = $ENV{GPT_LOCATION};
-if (!defined($gpath))
-{
-    $gpath = $ENV{GLOBUS_LCATION};
-}
+require Grid::GPT::Setup;
+
+my $metadata = new Grid::GPT::Setup(package_name => "gsi-openssh-setup");
+
+$gpath = $ENV{GLOBUS_LCATION};
 if (!defined($gpath))
 {
-    die "GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"
+    die "GLOBUS_LOCATION needs to be set before running this script"
 }
 
 #
@@ -90,7 +90,7 @@ sub fixpaths
         $f =~ /(.*\/)*(.*)$/;
         $g = "$f.tmp";
 
-        $result = system("cp $f $g");
+        $result = system("mv $f $g");
         if ($result != 0)
         {
             die "Failed to copy $f to $g!\n";
@@ -160,4 +160,4 @@ sub runkeygen
 fixpaths();
 runkeygen();
 
-exit 0;
+$metadata->finish();