admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Make trash.swift safer and more modern

Browse Source
This commit is contained in:
Dabezt 2021-12-31 14:07:42 +03:00
parent e4f106533e
commit 0b44dd5a48
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Library/Homebrew/cask/utils/trash.swift
View File

@ -4,22 +4,26 @@ import Foundation
extension FileHandle : TextOutputStream { extension FileHandle : TextOutputStream {
public func write(_ string: String) { public func write(_ string: String) {
self.write(string.data(using: .utf8)!) if let data = string.data(using: .utf8) { self.write(data) }
} }
} }
var stderr = FileHandle.standardError var stderr = FileHandle.standardError
let manager: FileManager = FileManager() let manager = FileManager.default
var success = true var success = true
for item in CommandLine.arguments[1...] { // The command line arguments given but without the script's name
let CMDLineArgs = Array(CommandLine.arguments.dropFirst())
for item in CMDLineArgs {
do { do {
let path: URL = URL(fileURLWithPath: item) let url = URL(fileURLWithPath: item)
var trashedPath: NSURL! var trashedPath: NSURL!
try manager.trashItem(at: path, resultingItemURL: &trashedPath) try manager.trashItem(at: url, resultingItemURL: &trashedPath)
print((trashedPath as URL).path, terminator: ":") print((trashedPath as URL).path, terminator: ":")
success = true
} catch { } catch {
print(item, terminator: ":", to: &stderr) print(item, terminator: ":", to: &stderr)
success = false success = false