summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorgoodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac>2004-05-05 16:12:07 +0000
committergoodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac>2004-05-05 16:12:07 +0000
commitd5490cdc11bd6dbbb05b56d96b3948e6cb914987 (patch)
treec3329522c2cae62a420c6cc4102ea04dd7ef6ba3 /lib
parent6c935b075c92c86a7c97b2ad40ca15525a3e3e9b (diff)
Fixing this file so it is proper perl and turns arrangement_dir into a full
path. git-svn-id: http://svn.cactuscode.org/flesh/trunk@3692 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib')
-rw-r--r--lib/sbin/CVSUpdate.pl11
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/sbin/CVSUpdate.pl b/lib/sbin/CVSUpdate.pl
index 60177f87..39784b7f 100644
--- a/lib/sbin/CVSUpdate.pl
+++ b/lib/sbin/CVSUpdate.pl
@@ -51,19 +51,22 @@ if (!$debug)
close (CS);
}
+$home = `pwd`;
+chomp ($home);
+
($arrangement_dir, $thornlist) = @ARGV;
+$arrangement_dir = "$home/$arrangement_dir";
+
if ($thornlist =~ /^$/) {
%info = &buildthorns($arrangement_dir,"thorns");
} else {
%info = &ReadThornlist($thornlist);
}
-$home = `pwd`;
-chomp ($home);
foreach $thorn (sort keys %info)
{
- if( ! -d "$thorn/CVS")
+ if( ! -d "$arrangement_dir/$thorn/CVS")
{
print "Ignoring $thorn - no CVS directory\n";
next;
@@ -99,7 +102,7 @@ foreach $thorn (sort keys %info)
}
}
}
- chdir $home) || die "Cannot change back to Cactus home directory '$home'\n";
+ chdir $home || die "Cannot change back to Cactus home directory '$home'\n";
exit;