Skip to content

Commit 33423da

Browse files
committed
fix: ensure files cmd gen
1 parent 64d6d2d commit 33423da

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

src/api/exec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ impl<'a> ExecApi<'a> {
325325
format!(
326326
r#"grep -q "^$ROOZ_META_USER:x:$ROOZ_META_UID" /etc/passwd && exit 0
327327
sed -i "/:x:${{ROOZ_META_UID}}/d" /etc/passwd && \
328-
echo "$ROOZ_META_USER:x:$ROOZ_META_UID:$ROOZ_META_UID:$ROOZ_META_USER:$ROOZ_META_HOME:/bin/sh" >> /etc/passwd"#,
328+
echo "$ROOZ_META_USER:x:$ROOZ_META_UID:$ROOZ_META_UID:$ROOZ_META_USER:$ROOZ_META_HOME:/bin/sh" >> /etc/passwd"#,
329329
)
330330
.as_ref(),
331331
"make_user.sh",

src/api/volume.rs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use std::path::Path;
44
use crate::config::config::{DataEntry, DataExt, DataValue};
55
use crate::model::types::{
66
DataEntryKey, DataEntryVolumeSpec, FileSpec, TargetDir, TargetFile, TargetPath, UserFile,
7-
VolumeName, VolumeSpec, VolumeFilesSpec,
7+
VolumeFilesSpec, VolumeName, VolumeSpec,
88
};
99
use crate::util::id;
1010
use crate::util::labels::DATA_ROLE;
@@ -394,8 +394,13 @@ impl<'a> VolumeApi<'a> {
394394
.join(" && ".into());
395395

396396
if let Some(uid) = uid {
397-
let chown = format!(" && chown -R {}:{} {}", uid, uid, path);
398-
cmd = format!("{}{}", cmd, chown)
397+
let chown = format!("chown -R {}:{} {}", uid, uid, path);
398+
cmd = format!(
399+
"{}{}{}",
400+
cmd,
401+
if cmd.is_empty() { "" } else { " && " },
402+
chown
403+
)
399404
}
400405

401406
self.container

0 commit comments

Comments
 (0)