1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
--- BackupPC-3.3.0.orig/configure.pl
+++ BackupPC-3.3.0/configure.pl
@@ -327,25 +327,11 @@
EOF
my($name, $passwd, $Uid, $Gid);
-while ( 1 ) {
- $Conf{BackupPCUser} = prompt("--> BackupPC should run as user",
- $Conf{BackupPCUser} || "backuppc",
- "backuppc-user");
- if ( $opts{"set-perms"} ) {
+ $Conf{BackupPCUser} = prompt("--> BackupPC should run as user",
+ $Conf{BackupPCUser} || "backuppc",
+ "backuppc-user");
($name, $passwd, $Uid, $Gid) = getpwnam($Conf{BackupPCUser});
- last if ( $name ne "" );
- print <<EOF;
-getpwnam() says that user $Conf{BackupPCUser} doesn't exist. Please
-check the name and verify that this user is in the passwd file.
-
-EOF
- exit(1) if ( $opts{batch} );
- } else {
- last;
- }
-}
-
print <<EOF;
Please specify an install directory for BackupPC. This is where the
@@ -532,12 +518,6 @@
) ) {
next if ( -d "$DestDir$Conf{InstallDir}/$dir" );
mkpath("$DestDir$Conf{InstallDir}/$dir", 0, 0755);
- if ( !-d "$DestDir$Conf{InstallDir}/$dir"
- || !my_chown($Uid, $Gid, "$DestDir$Conf{InstallDir}/$dir") ) {
- die("Failed to create or chown $DestDir$Conf{InstallDir}/$dir\n");
- } else {
- print("Created $DestDir$Conf{InstallDir}/$dir\n");
- }
}
#
@@ -546,11 +526,6 @@
foreach my $dir ( ($Conf{CgiImageDir}) ) {
next if ( $dir eq "" || -d "$DestDir$dir" );
mkpath("$DestDir$dir", 0, 0755);
- if ( !-d "$DestDir$dir" || !my_chown($Uid, $Gid, "$DestDir$dir") ) {
- die("Failed to create or chown $DestDir$dir");
- } else {
- print("Created $DestDir$dir\n");
- }
}
#
@@ -566,12 +541,6 @@
"$Conf{LogDir}",
) ) {
mkpath("$DestDir$dir", 0, 0750) if ( !-d "$DestDir$dir" );
- if ( !-d "$DestDir$dir"
- || !my_chown($Uid, $Gid, "$DestDir$dir") ) {
- die("Failed to create or chown $DestDir$dir\n");
- } else {
- print("Created $DestDir$dir\n");
- }
}
printf("Installing binaries in $DestDir$Conf{InstallDir}/bin\n");
|