Skip to content

Commit c82729c

Browse files
committed
Fix generated chown command (#1151)
1 parent e2abc5a commit c82729c

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

src/main/scala/com/typesafe/sbt/packager/debian/DebianPlugin.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ trait DebianPluginLike {
419419
streams: TaskStreams): (String, String) = {
420420
// how to create the chownCmd. TODO maybe configurable?
421421
def chownCmd(user: String, group: String)(path: String): String =
422-
s"chown $user:$group $path"
422+
s"chown $user:$group '$path'"
423423

424424
val header = "# Chown definitions created by SBT Native Packager\n"
425425
// Check for non root user/group and create chown commands

src/sbt-test/debian/daemon-group-gid-deb/build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ TaskKey[Unit]("checkControlFiles") := {
2424
"postinst misses useradd for daemonuser: " + postinst
2525
)
2626
assert(
27-
postinst contains "chown daemonuser:daemongroup /var/log/debian-test",
28-
"postinst misses chown daemonuser /var/log/debian-test: " + postinst
27+
postinst contains "chown daemonuser:daemongroup '/var/log/debian-test'",
28+
"postinst misses chown daemonuser '/var/log/debian-test': " + postinst
2929
)
3030
assert(!(postinst contains "addgroup --system daemonuser"), "postinst has addgroup for daemonuser: " + postinst)
3131
assert(

src/sbt-test/debian/daemon-user-deb/build.sbt

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ TaskKey[Unit]("checkControlFiles") := {
2323
"postinst misses useradd for daemonuser: " + postinst
2424
)
2525
assert(
26-
postinst contains "chown daemonuser:daemongroup /var/log/debian-test",
27-
"postinst misses chown daemonuser /var/log/debian-test: " + postinst
26+
postinst contains "chown daemonuser:daemongroup '/var/log/debian-test'",
27+
"postinst misses chown daemonuser '/var/log/debian-test': " + postinst
2828
)
2929
assert(!(postinst contains "addgroup --system daemonuser"), "postinst has addgroup for daemonuser: " + postinst)
3030
assert(
@@ -37,7 +37,7 @@ TaskKey[Unit]("checkControlFiles") := {
3737
assert(!(postinst contains "chown daemonuser:debian-test"), "postinst contains wrong group: \n" + postinst)
3838
assert(!(postinst contains "chown debian-test:debian-test"), "postinst contains wrong user and group: \n" + postinst)
3939
assert(
40-
!(postinst contains "chown daemonuser:daemongroup /usr/share/debian-test"),
40+
!(postinst contains "chown daemonuser:daemongroup '/usr/share/debian-test'"),
4141
"postinst contains chown /usr/share/app_name: \n" + postinst
4242
)
4343
streams.value.log.success("Successfully tested upstart control files")

src/sbt-test/debian/daemon-user-uid-deb/build.sbt

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ TaskKey[Unit]("checkControlFiles") := {
2424
"postinst misses useradd for daemonuser: " + postinst
2525
)
2626
assert(
27-
postinst contains "chown daemonuser:daemongroup /var/log/debian-test",
28-
"postinst misses chown daemonuser /var/log/debian-test: " + postinst
27+
postinst contains "chown daemonuser:daemongroup '/var/log/debian-test'",
28+
"postinst misses chown daemonuser '/var/log/debian-test': " + postinst
2929
)
3030
assert(!(postinst contains "addgroup --system daemonuser"), "postinst has addgroup for daemonuser: " + postinst)
3131
assert(
@@ -38,7 +38,7 @@ TaskKey[Unit]("checkControlFiles") := {
3838
assert(!(postinst contains "chown daemonuser:debian-test"), "postinst contains wrong group: \n" + postinst)
3939
assert(!(postinst contains "chown debian-test:debian-test"), "postinst contains wrong user and group: \n" + postinst)
4040
assert(
41-
!(postinst contains "chown daemonuser:daemongroup /usr/share/debian-test"),
41+
!(postinst contains "chown daemonuser:daemongroup '/usr/share/debian-test'"),
4242
"postinst contains chown /usr/share/app_name: \n" + postinst
4343
)
4444
streams.value.log.success("Successfully tested upstart control files")

0 commit comments

Comments
 (0)