Skip to content

Commit d14b588

Browse files
RedandeHeliozoa
authored andcommitted
Change permissions from 744 to 755 for all zipped files
1 parent aafdf41 commit d14b588

File tree

3 files changed

+18
-7
lines changed

3 files changed

+18
-7
lines changed

tmc-langs-plugins/src/tmc_zip.rs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,17 @@ pub fn zip<P: StudentFilePolicy>(policy: P, root_directory: &Path) -> Result<Vec
2828
.unwrap_or_else(|| entry.path());
2929
if entry.path().is_dir() {
3030
log::trace!("adding directory {}", path.display());
31-
writer
32-
.add_directory(path_to_zip_compatible_string(path), FileOptions::default())?;
31+
writer.add_directory(
32+
path_to_zip_compatible_string(path),
33+
FileOptions::default().unix_permissions(0o755),
34+
)?;
3335
} else {
3436
let bytes = file_util::read_file(entry.path())?;
3537
log::trace!("writing file {}", path.display());
36-
writer.start_file(path_to_zip_compatible_string(path), FileOptions::default())?;
38+
writer.start_file(
39+
path_to_zip_compatible_string(path),
40+
FileOptions::default().unix_permissions(0o755),
41+
)?;
3742
writer
3843
.write_all(&bytes)
3944
.map_err(|e| TmcError::ZipWrite(path.to_path_buf(), e))?;

tmc-langs/src/course_refresher.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,15 +379,15 @@ fn execute_zip(
379379
if entry.path().is_file() {
380380
writer.start_file(
381381
relative_path.to_string_lossy(),
382-
zip::write::FileOptions::default(),
382+
zip::write::FileOptions::default().unix_permissions(0o755),
383383
)?;
384384
let bytes = file_util::read_file(entry.path())?;
385385
writer.write_all(&bytes).map_err(LangsError::ZipWrite)?;
386386
} else {
387387
// java-langs expects directories to have their own entries
388388
writer.start_file(
389389
relative_path.join("").to_string_lossy(), // java-langs expects directory entries to have a trailing slash
390-
zip::write::FileOptions::default(),
390+
zip::write::FileOptions::default().unix_permissions(0o755),
391391
)?;
392392
}
393393
}

tmc-langs/src/submission_packaging.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,9 +276,15 @@ pub fn prepare_submission(
276276
stripped.display()
277277
);
278278
if entry_path.is_dir() {
279-
archive.add_directory(stripped.to_string_lossy(), FileOptions::default())?;
279+
archive.add_directory(
280+
stripped.to_string_lossy(),
281+
FileOptions::default().unix_permissions(0o755),
282+
)?;
280283
} else {
281-
archive.start_file(stripped.to_string_lossy(), FileOptions::default())?;
284+
archive.start_file(
285+
stripped.to_string_lossy(),
286+
FileOptions::default().unix_permissions(0o755),
287+
)?;
282288
let mut file = file_util::open_file(entry_path)?;
283289
std::io::copy(&mut file, &mut archive)
284290
.map_err(|e| LangsError::TarAppend(entry_path.to_path_buf(), e))?;

0 commit comments

Comments
 (0)