Skip to content
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

Fix product path handling in Mac Crafter #6966

Merged
merged 4 commits into from
Aug 6, 2024
+9 −3
Merged

Fix product path handling in Mac Crafter #6966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3588c13
Fix final path that app is copied to in mac crafter
claucambra Aug 5, 2024
d1cb170
Only create product path's directory if it doesn't exist already
claucambra Aug 5, 2024
a3081f2
Add default product folder to gitignore
claucambra Aug 6, 2024
f8bde40
Add mac-crafter Package.resolved to gitignore
claucambra Aug 6, 2024
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 admin/osx/mac-crafter/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
.DS_Store
/.build
/Packages
Package.resolved
xcuserdata/
DerivedData/
.swiftpm/configuration/registries.json
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
.netrc
build/
build\downloads
product/
wget-log*
10 changes: 7 additions & 3 deletions admin/osx/mac-crafter/Sources/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,13 @@ struct MacCrafter: ParsableCommand {
let clientAppDir = "\(clientBuildDir)/image-\(buildType)-master/\(appName).app"
try codesignClientAppBundle(at: clientAppDir, withCodeSignIdentity: codeSignIdentity)

print("Placing Nextcloud Desktop Client in product directory...")
try fm.createDirectory(atPath: productPath, withIntermediateDirectories: true, attributes: nil)
try fm.copyItem(atPath: clientAppDir, toPath: productPath)
print("Placing Nextcloud Desktop Client in \(productPath)...")
if !fm.fileExists(atPath: productPath) {
try fm.createDirectory(
atPath: productPath, withIntermediateDirectories: true, attributes: nil
)
}
try fm.copyItem(atPath: clientAppDir, toPath: "\(productPath)/\(appName).app")

print("Done!")
}
Expand Down
Loading