Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1:/tmp/cvs-serv11244
Modified Files:
Tag: uidgid
PkgVersion.pm User.pm
Log Message:
Adding call for remove user to postrm
Index: PkgVersion.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.128.8.6
retrieving revision 1.128.8.7
diff -u -d -r1.128.8.6 -r1.128.8.7
--- PkgVersion.pm 12 Aug 2003 02:08:40 -0000 1.128.8.6
+++ PkgVersion.pm 12 Aug 2003 02:14:36 -0000 1.128.8.7
@@ -36,7 +36,7 @@
use Fink::Status;
use Fink::VirtPackage;
use Fink::Bootstrap qw(&get_bsbase);
-use Fink::User qw(&get_perms &add_user_script &remove_user_script);
+use Fink::User qw(&get_perms &add_user &remove_user);
use File::Basename qw(&dirname);
@@ -1644,9 +1644,9 @@
### Check for Group/User, if exists then process
if ($self->has_param("Group") || $self->has_param("User")) {
### Add user/group check to preinst if needed
- if ($scriptname eq "preinst" && $self->{_type} = "bundle") {
+ if ($self->{_type} = "bundle") {
my ($name, $type) = (0, 0);
- my ($desc, $shell, $home, $group, $tmp);
+ my ($desc, $shell, $home, $group, $tmp, $script);
if ($self->has_param("Group")) {
$tmp = $self->param("Group");
@@ -1661,13 +1661,26 @@
$type = "user";
}
- my $script = Fink::User->add_user_script($name, $type,
- $desc, $shell, $home, $group);
+ if ($scriptname eq "preinst") {
+ $script = "";
+ $script = Fink::User->add_user($name, $type,
+ $desc, $shell, $home, $group);
- if ($script) {
- ### Add $script to top of preinstscript
- $script .= "\n";
- $scriptbody = $script;
+ if ($script) {
+ ### Add $script to top of preinstscript
+ $script .= "\n";
+ $scriptbody = $script;
+ }
+ }
+ if($scriptname eq "postrm") {
+ $script = "";
+ $script = Fink::User->remove_user($name, $type);
+
+ if ($script) {
+ ### Add $script to top of postrmscript
+ $script .= "\n";
+ $scriptbody = $script;
+ }
}
}
Index: User.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Attic/User.pm,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -d -r1.1.2.16 -r1.1.2.17
--- User.pm 12 Aug 2003 02:08:41 -0000 1.1.2.16
+++ User.pm 12 Aug 2003 02:14:36 -0000 1.1.2.17
@@ -38,7 +38,7 @@
$VERSION = 1.00;
@ISA = qw(Exporter);
@EXPORT = qw();
- @EXPORT_OK = qw(&get_perms &add_user_script &remove_user_script);
+ @EXPORT_OK = qw(&get_perms &add_user &remove_user);
%EXPORT_TAGS = ( ); # eg: TAG => [ qw!name1 name2! ],
}
our @EXPORT_OK;
@@ -94,13 +94,13 @@
$self->set_perms($rootdir, $file);
- $script = $self->build_chown_script($file, $usr, $grp);
+ $script = $self->get_chown($file, $usr, $grp);
return $script;
}
### add check/add user script and then set perms
-sub add_user_script {
+sub add_user {
my $self = shift;
my $name = shift;
my $type = shift;
@@ -159,7 +159,7 @@
}
### Check remove user/group
-sub remove_user_script {
+sub remove_user {
my $self = shift;
my $name = shift;
my $type = shift;
@@ -188,7 +188,7 @@
}
### build script to set user/groups
-sub build_chown_script {
+sub get_chown {
my $self = shift;
my $files = shift;
my $users = shift;
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
