Skip to content

FIX: swift-doc creates file and directory with unexpected permission … #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 29, 2020
Merged

FIX: swift-doc creates file and directory with unexpected permission … #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
#131 by @MattKiazyk.
- Fixed display of bullet list items in documentation discussion parts.
#130 by @mattt.
- Fixed file and directory unexpected permissions.
#146 by @niw.

## [1.0.0-beta.3] - 2020-05-19

Expand Down
2 changes: 1 addition & 1 deletion Sources/swift-doc/Subcommands/Generate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ extension SwiftDoc {
let baseURL = options.baseURL

let outputDirectoryURL = URL(fileURLWithPath: options.output)
try fileManager.createDirectory(at: outputDirectoryURL, withIntermediateDirectories: true, attributes: fileAttributes)
try fileManager.createDirectory(at: outputDirectoryURL, withIntermediateDirectories: true)

do {
let format = options.format
Expand Down
6 changes: 1 addition & 5 deletions Sources/swift-doc/Supporting Types/Page.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,8 @@ extension Page {
}
}



func writeFile(_ data: Data, to url: URL) throws {
let fileManager = FileManager.default
try fileManager.createDirectory(at: url.deletingLastPathComponent(), withIntermediateDirectories: true, attributes: [.posixPermissions: 0o744])

try fileManager.createDirectory(at: url.deletingLastPathComponent(), withIntermediateDirectories: true)
try data.write(to: url)
try fileManager.setAttributes([.posixPermissions: 0o744], ofItemAtPath: url.path)
}
1 change: 0 additions & 1 deletion Sources/swift-doc/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ LoggingSystem.bootstrap { label in
let logger = Logger(label: "org.swiftdoc.swift-doc")

let fileManager = FileManager.default
let fileAttributes: [FileAttributeKey : Any] = [.posixPermissions: 0o744]

var standardOutput = FileHandle.standardOutput
var standardError = FileHandle.standardError
Expand Down
2 changes: 1 addition & 1 deletion Tests/SwiftDocTests/Helpers/temporaryFile.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Foundation

func temporaryFile(path: String? = nil, contents: String) throws -> URL {
let temporaryDirectoryURL = URL(fileURLWithPath: NSTemporaryDirectory()).appendingPathComponent(ProcessInfo.processInfo.globallyUniqueString)
try FileManager.default.createDirectory(at: temporaryDirectoryURL, withIntermediateDirectories: true, attributes: [.posixPermissions: 0o766])
try FileManager.default.createDirectory(at: temporaryDirectoryURL, withIntermediateDirectories: true)

let path = path ?? ProcessInfo.processInfo.globallyUniqueString
let temporaryFileURL = temporaryDirectoryURL.appendingPathComponent(path)
Expand Down