starred/dotnet-packaging
1
0
Fork 0
mirror of https://github.com/quamotion/dotnet-packaging.git synced 2026-07-08 18:06:08 +00:00
Code Issues 207 Packages Projects Releases Wiki Activity

Merge pull request #119 from bartsaintgermain/StandardHome

Browse Source 
Use the standard home folder when creating the new user
This commit is contained in:
bartsaintgermain
2019-11-22 14:57:57 +01:00
committed by GitHub
parent a027792a6a 01f8a35a6d
commit d2b8e72d7b
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Packaging.Targets.Tests/Deb/DebPackageCreatorTests.cs
View File

@@ -129,7 +129,7 @@ namespace Packaging.Targets.Tests.Deb
additionalMetadata: null);
Assert.Equal(@"/usr/sbin/groupadd -r demouser 2>/dev/null || :
/usr/sbin/useradd -g demouser -s /sbin/nologin -r -d /opt/local demouser 2>/dev/null || :
/usr/sbin/useradd -g demouser -s /sbin/nologin -r demouser 2>/dev/null || :
echo 'Hello from pre install'
", pkg.PreInstallScript, ignoreLineEndingDifferences: true);
Assert.Equal(@"systemctl daemon-reload

2
Packaging.Targets/Deb/DebPackageCreator.cs
View File

@@ -73,7 +73,7 @@ namespace Packaging.Targets.Deb
// Add the user and group, under which the service runs.
// These users are never removed because UIDs are re-used on Linux.
pkg.PreInstallScript += $"/usr/sbin/groupadd -r {userName} 2>/dev/null || :\n" +
$"/usr/sbin/useradd -g {userName} -s /sbin/nologin -r -d {prefix} {userName} 2>/dev/null || :\n";
$"/usr/sbin/useradd -g {userName} -s /sbin/nologin -r {userName} 2>/dev/null || :\n";
}
if (installService)

2
Packaging.Targets/Rpm/RpmPackageCreator.cs
View File

@@ -335,7 +335,7 @@ namespace Packaging.Targets.Rpm
// Add the user and group, under which the service runs.
// These users are never removed because UIDs are re-used on Linux.
preIn += $"/usr/sbin/groupadd -r {userName} 2>/dev/null || :\n" +
$"/usr/sbin/useradd -g {userName} -s /sbin/nologin -r -d {prefix} {userName} 2>/dev/null || :\n";
$"/usr/sbin/useradd -g {userName} -s /sbin/nologin -r {userName} 2>/dev/null || :\n";
}
if (installService)

2
demo/cliscd/Tests.cs
View File

@@ -13,7 +13,7 @@ namespace cliscd
Assert.NotEqual(0, user.UserId);
Assert.NotEqual(0, user.GroupId);
Assert.Equal("quamotion", user.GroupName);
Assert.Equal("/usr/share/cliscd", user.HomeDirectory);
Assert.Equal("/home/quamotion", user.HomeDirectory);
}
[Fact]