- Unbreak package building: syntax errors and logical mistakes in pkg-install
Approved by: maintainer
This commit is contained in:
parent
ad392a8985
commit
6551908e76
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=135050
@ -67,32 +67,6 @@ if (${?PACKAGE_BUILDING}) then
|
||||
set doguid = 1;
|
||||
endif
|
||||
|
||||
if ($doguid) then
|
||||
set k = 1;
|
||||
foreach group ($groups) {
|
||||
set chkgid = (`$pw groupshow $group | $sed -e "s/:/ /"`);
|
||||
if ($chkgid[3] != $gids[$k]) then
|
||||
echo "Group '$group' should have gid '$gids[$k]'";
|
||||
exit 1;
|
||||
endif
|
||||
|
||||
@ k = $k + 1;
|
||||
}
|
||||
|
||||
set k = 1;
|
||||
foreach user ($users) {
|
||||
set chkuid = (`$pw usershow $user | $sed -e "s/:/ /"`);
|
||||
if ($chkuid[3] != $uids[$k]) then
|
||||
echo "User '$user' should have uid '$uids[$k]'";
|
||||
exit 1;
|
||||
endif
|
||||
|
||||
@ k = $k + 1;
|
||||
}
|
||||
|
||||
exit 0;
|
||||
endif
|
||||
|
||||
set k = 1;
|
||||
foreach group ($groups)
|
||||
$pw groupshow $group >& $null;
|
||||
@ -106,6 +80,14 @@ foreach group ($groups)
|
||||
endif
|
||||
endif
|
||||
|
||||
if ($doguid) then
|
||||
set chkgid = (`$pw groupshow $group | $sed -e "s/:/ /g"`);
|
||||
if ($chkgid[3] != $gids[$k]) then
|
||||
echo "Group '$group' should have gid '$gids[$k]'";
|
||||
exit 1;
|
||||
endif
|
||||
endif
|
||||
|
||||
@ k = $k + 1;
|
||||
end
|
||||
|
||||
@ -128,6 +110,14 @@ foreach user ($users)
|
||||
endif
|
||||
endif
|
||||
|
||||
if ($doguid) then
|
||||
set chkuid = (`$pw usershow $user | $sed -e "s/:/ /g"`);
|
||||
if ($chkuid[3] != $uids[$k]) then
|
||||
echo "User '$user' should have uid '$uids[$k]'";
|
||||
exit 1;
|
||||
endif
|
||||
endif
|
||||
|
||||
@ k = $k + 1;
|
||||
end
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user