Mirrors/mas
2
0
Fork 0
mirror of https://github.com/mas-cli/mas synced 2025-02-16 12:38:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into patch-1

Browse source
This commit is contained in:
Ben Chatelain 2022-07-04 17:42:23 -06:00 • committed by GitHub
commit 2658872e33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 109 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build-test.yml vendored
View file

@ -38,7 +38,7 @@ jobs:
steps: steps:
# https://github.com/actions/checkout#usage # https://github.com/actions/checkout#usage
- uses: actions/checkout@v2 - uses: actions/checkout@v3
with: with:
# A fetch-depth of 0 includes all history and tags for script/version # A fetch-depth of 0 includes all history and tags for script/version
fetch-depth: 0 fetch-depth: 0

2
.github/workflows/danger.yml vendored
View file

@ -7,7 +7,7 @@ jobs:
name: Danger name: Danger
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Danger - name: Danger
# https://github.com/orgs/danger/packages/container/package/danger-swift # https://github.com/orgs/danger/packages/container/package/danger-swift
uses: docker://ghcr.io/danger/danger-swift:3.12.3 uses: docker://ghcr.io/danger/danger-swift:3.12.3

2
.swift-version
View file

@ -1 +1 @@
5.3.2 5.6.1

68
Brewfile.lock.json
View file

@ -2,15 +2,15 @@
"entries": { "entries": {
"brew": { "brew": {
"markdownlint-cli": { "markdownlint-cli": {
"version": "0.30.0", "version": "0.31.1",
"bottle": { "bottle": {
"rebuild": 0, "rebuild": 0,
"root_url": "https://ghcr.io/v2/homebrew/core", "root_url": "https://ghcr.io/v2/homebrew/core",
"files": { "files": {
"all": { "all": {
"cellar": ":any_skip_relocation", "cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/markdownlint-cli/blobs/sha256:8ada1bd40ab7ddd6566099ef74f8930ef1d8c4ce526e3f4d2619cfbd7e3651a4", "url": "https://ghcr.io/v2/homebrew/core/markdownlint-cli/blobs/sha256:26519a6a4330fd29cd897e61f8af2070def21758b06517c136690a5404d07d5a",
"sha256": "8ada1bd40ab7ddd6566099ef74f8930ef1d8c4ce526e3f4d2619cfbd7e3651a4" "sha256": "26519a6a4330fd29cd897e61f8af2070def21758b06517c136690a5404d07d5a"
} }
} }
} }
@ -55,74 +55,74 @@
} }
}, },
"shfmt": { "shfmt": {
"version": "3.4.2", "version": "3.5.1",
"bottle": { "bottle": {
"rebuild": 0, "rebuild": 0,
"root_url": "https://ghcr.io/v2/homebrew/core", "root_url": "https://ghcr.io/v2/homebrew/core",
"files": { "files": {
"arm64_monterey": { "arm64_monterey": {
"cellar": ":any_skip_relocation", "cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/shfmt/blobs/sha256:3d16adb18028a2bf572104d383a081d513ec3c608e2ea9dfd44fccf20c1e7b0f", "url": "https://ghcr.io/v2/homebrew/core/shfmt/blobs/sha256:633116b598a60ad576a79753208e13388f6a2460139c8aca44e5a25befdb017c",
"sha256": "3d16adb18028a2bf572104d383a081d513ec3c608e2ea9dfd44fccf20c1e7b0f" "sha256": "633116b598a60ad576a79753208e13388f6a2460139c8aca44e5a25befdb017c"
}, },
"arm64_big_sur": { "arm64_big_sur": {
"cellar": ":any_skip_relocation", "cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/shfmt/blobs/sha256:3eaff57d43b2b12b276a866e693fc76597091b6580b484cb27beb0f5b7a30f43", "url": "https://ghcr.io/v2/homebrew/core/shfmt/blobs/sha256:1b0653c0a44f7db5e78c5c6d67de534a52c4f588fb65e3acbb8211d06b871bd9",
"sha256": "3eaff57d43b2b12b276a866e693fc76597091b6580b484cb27beb0f5b7a30f43" "sha256": "1b0653c0a44f7db5e78c5c6d67de534a52c4f588fb65e3acbb8211d06b871bd9"
}, },
"monterey": { "monterey": {
"cellar": ":any_skip_relocation", "cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/shfmt/blobs/sha256:b4508d0a67b4a5802fa2cb9875687ec933c2369395521b23b89faf4e7eb53cad", "url": "https://ghcr.io/v2/homebrew/core/shfmt/blobs/sha256:e7168603f81cf1357c2460c5c476fa66bf5421183d4dedeafe9cf38550fe8855",
"sha256": "b4508d0a67b4a5802fa2cb9875687ec933c2369395521b23b89faf4e7eb53cad" "sha256": "e7168603f81cf1357c2460c5c476fa66bf5421183d4dedeafe9cf38550fe8855"
}, },
"big_sur": { "big_sur": {
"cellar": ":any_skip_relocation", "cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/shfmt/blobs/sha256:b6765390c7387bb16bfa4fb63bb75bedf346bd2f42e70b2042c88230e668bd70", "url": "https://ghcr.io/v2/homebrew/core/shfmt/blobs/sha256:0e0683566d83cceecd4d02596e3c899a640918ff067b6e15e10f8aee424f1759",
"sha256": "b6765390c7387bb16bfa4fb63bb75bedf346bd2f42e70b2042c88230e668bd70" "sha256": "0e0683566d83cceecd4d02596e3c899a640918ff067b6e15e10f8aee424f1759"
}, },
"catalina": { "catalina": {
"cellar": ":any_skip_relocation", "cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/shfmt/blobs/sha256:ab7bb4cf991a41eecda3fca4bef473dd711a62b89d906f3861515b8ec1386c98", "url": "https://ghcr.io/v2/homebrew/core/shfmt/blobs/sha256:4fabb118ba0da244f2b0ffe280b28e343712fac23e738ddf1db29fad68526d73",
"sha256": "ab7bb4cf991a41eecda3fca4bef473dd711a62b89d906f3861515b8ec1386c98" "sha256": "4fabb118ba0da244f2b0ffe280b28e343712fac23e738ddf1db29fad68526d73"
}, },
"x86_64_linux": { "x86_64_linux": {
"cellar": ":any_skip_relocation", "cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/shfmt/blobs/sha256:8ed1ad0c691990dd7bc6bc1665f5c47f6815b73ad28e7d97bce07af69b28f962", "url": "https://ghcr.io/v2/homebrew/core/shfmt/blobs/sha256:faa60f70812132e10f94477676499a1e2bacb0d06fbe437e8480a997695c2203",
"sha256": "8ed1ad0c691990dd7bc6bc1665f5c47f6815b73ad28e7d97bce07af69b28f962" "sha256": "faa60f70812132e10f94477676499a1e2bacb0d06fbe437e8480a997695c2203"
} }
} }
} }
}, },
"swiftformat": { "swiftformat": {
"version": "0.49.1", "version": "0.49.9",
"bottle": { "bottle": {
"rebuild": 0, "rebuild": 0,
"root_url": "https://ghcr.io/v2/homebrew/core", "root_url": "https://ghcr.io/v2/homebrew/core",
"files": { "files": {
"arm64_monterey": { "arm64_monterey": {
"cellar": ":any_skip_relocation", "cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:c43caffb4d2cf9546b0a8fa732ffe5d95b1b1fd7ab03f1c5da39c8e7a0e8ecb4", "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:bacd0dc8f488fd7909252467eaf16dcd339468857aea13a3643f7e0efd7715f8",
"sha256": "c43caffb4d2cf9546b0a8fa732ffe5d95b1b1fd7ab03f1c5da39c8e7a0e8ecb4" "sha256": "bacd0dc8f488fd7909252467eaf16dcd339468857aea13a3643f7e0efd7715f8"
}, },
"arm64_big_sur": { "arm64_big_sur": {
"cellar": ":any_skip_relocation", "cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:ad0ce5fc15fe1d339d366ece18694fdc1d14021684462a126ed20b537a1a9bf5", "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:7bc39a57d110f727993aa556cca5cba5549d536367bc12f25b56e25c4fdfa194",
"sha256": "ad0ce5fc15fe1d339d366ece18694fdc1d14021684462a126ed20b537a1a9bf5" "sha256": "7bc39a57d110f727993aa556cca5cba5549d536367bc12f25b56e25c4fdfa194"
}, },
"monterey": { "monterey": {
"cellar": ":any_skip_relocation", "cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:33652b8015d31dbe45e00bdc598f1b228cb63c7083b90137fdec66318a88010f", "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:739d230372dd797d5cf5a0586156068ecb5965878550a67b5ca56ccdf2799557",
"sha256": "33652b8015d31dbe45e00bdc598f1b228cb63c7083b90137fdec66318a88010f" "sha256": "739d230372dd797d5cf5a0586156068ecb5965878550a67b5ca56ccdf2799557"
}, },
"big_sur": { "big_sur": {
"cellar": ":any_skip_relocation", "cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:f0ad88e5594a6a3e5a35834a9a22473a05511375942dbb046d1085cc537d60b8", "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:22080bdc75b03f5926d68fb248fc401d6a94876205ce03663a8950644b0e41e6",
"sha256": "f0ad88e5594a6a3e5a35834a9a22473a05511375942dbb046d1085cc537d60b8" "sha256": "22080bdc75b03f5926d68fb248fc401d6a94876205ce03663a8950644b0e41e6"
}, },
"catalina": { "catalina": {
"cellar": ":any_skip_relocation", "cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:564f5daf9cd82407843aed590bd4190f3e5aaa73a30b3bc8ae07135f1319ac97", "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:d4cda88cf3bef7b18e960197b8db4826f234e3b3434ba902c3924c37b9040fe8",
"sha256": "564f5daf9cd82407843aed590bd4190f3e5aaa73a30b3bc8ae07135f1319ac97" "sha256": "d4cda88cf3bef7b18e960197b8db4826f234e3b3434ba902c3924c37b9040fe8"
} }
} }
} }
@ -130,12 +130,12 @@
}, },
"tap": { "tap": {
"peripheryapp/periphery": { "peripheryapp/periphery": {
"revision": "3b6699d53841e642169dc64e1acef1397806a081" "revision": "020a0b79994d454dbc8dbd886009137fd741b836"
} }
}, },
"cask": { "cask": {
"periphery": { "periphery": {
"version": "2.8.3", "version": "2.9.0",
"options": { "options": {
"full_name": "periphery" "full_name": "periphery"
} }
@ -145,12 +145,12 @@
"system": { "system": {
"macos": { "macos": {
"monterey": { "monterey": {
"HOMEBREW_VERSION": "3.3.9-36-ge970bb1", "HOMEBREW_VERSION": "3.5.3-75-g39c9e2d",
"HOMEBREW_PREFIX": "/opt/homebrew", "HOMEBREW_PREFIX": "/opt/homebrew",
"Homebrew/homebrew-core": "f2b69fcaf6cf9925caac56dad26d39d30e89b42c", "Homebrew/homebrew-core": "00e5383db36fddc6b26df896229289b42462e63e",
"CLT": "13.2.0.0.1.1638488800", "CLT": "13.4.0.0.1.1651278267",
"Xcode": "13.2.1", "Xcode": "13.4.1",
"macOS": "12.1" "macOS": "12.4"
} }
} }
} }

66
Makefile
View file

@ -3,7 +3,6 @@
# mas # mas
# #
################################################################################ ################################################################################
# #
# Variables # Variables
@ -19,7 +18,7 @@ PREFIX ?= /usr/local
# Swift 5.3 # Swift 5.3
# SWIFT_VERSION = swift-5.3-DEVELOPMENT-SNAPSHOT-2020-04-21-a # SWIFT_VERSION = swift-5.3-DEVELOPMENT-SNAPSHOT-2020-04-21-a
SWIFT_VERSION = 5.3.2 SWIFT_VERSION = 5.6.1
# set EXECUTABLE_DIRECTORY according to your specific environment # set EXECUTABLE_DIRECTORY according to your specific environment
# run swift build and see where the output executable is created # run swift build and see where the output executable is created
@ -33,46 +32,60 @@ PLATFORM = $(ARCH)-apple-macosx
EXECUTABLE_DIRECTORY = ./.build/${PLATFORM}/debug EXECUTABLE_DIRECTORY = ./.build/${PLATFORM}/debug
endif endif
################################################################################
#
# Help
#
.DEFAULT_GOAL := help
.PHONY: help
help: MAKEFILE_FMT = " \033[36m%-25s\033[0m%s\n"
help: ## (default) Displays this message
@echo "Ditto main Makefile."
@echo ""
@echo "Targets:"
@grep -E '^[a-zA-Z0-9_-]*:.*?##' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?##"}; {printf $(MAKEFILE_FMT), $$1, $$2}'
@echo ""
@echo "Parameters:"
@grep -E '^[A-Z0-9_-]* ?\?=.*?##' $(MAKEFILE_LIST) | awk 'BEGIN {FS = " ?\\?=.*?##"}; {printf $(MAKEFILE_FMT), $$1, $$2}'
: # Hacky way to display a newline ##
################################################################################ ################################################################################
# #
# Targets # Targets
# #
# Prints versions of tools used by this Makefile.
.PHONY: version .PHONY: version
version: version: ## Prints versions of tools used by this Makefile.
xcodebuild -version xcodebuild -version
swiftenv version swiftenv version
swift --version swift --version
swift package tools-version swift package tools-version
.PHONY: init .PHONY: init
init: init: ## Installs tools.
- swiftenv install $(SWIFT_VERSION) - swiftenv install $(SWIFT_VERSION)
swiftenv local $(SWIFT_VERSION) swiftenv local $(SWIFT_VERSION)
.PHONY: bootstrap .PHONY: bootstrap
bootstrap: bootstrap: ## Installs tools.
script/bootstrap script/bootstrap
.PHONY: clean .PHONY: clean
clean: clean: ## Cleans built products.
script/clean script/clean
.PHONY: distclean
distclean: clean
.PHONY: updateHeaders .PHONY: updateHeaders
updateHeaders: updateHeaders: ## Updates private headers.
script/update_headers script/update_headers
.PHONY: build .PHONY: build
build: build: ## Builds the project.
script/build script/build
.PHONY: test .PHONY: test
test: build test: build ## Runs tests.
script/test script/test
# make run ARGS="asdf" # make run ARGS="asdf"
@ -81,54 +94,53 @@ run: build
${EXECUTABLE_DIRECTORY}/${CMD_NAME} $(ARGS) ${EXECUTABLE_DIRECTORY}/${CMD_NAME} $(ARGS)
.PHONY: install .PHONY: install
install: install: ## Installs the project.
script/install $(PREFIX) script/install $(PREFIX)
.PHONY: uninstall .PHONY: uninstall
uninstall: uninstall: ## Uninstalls the project.
script/uninstall script/uninstall
.PHONY: format .PHONY: format
format: format: ## Formats source code.
script/format script/format
.PHONY: lint .PHONY: lint
lint: lint: ## Lints source code.
script/lint script/lint
.PHONY: danger .PHONY: danger
danger: danger: ## Runs danger.
script/danger script/danger
# Builds bottles # Builds bottles
.PHONY: bottles .PHONY: bottles
bottles: bottles: ## Builds bottles.
script/bottle script/bottle
# Alias for bottles
.PHONY: bottle .PHONY: bottle
bottle: bottles bottle: bottles ## Alias for bottles
.PHONY: package .PHONY: package
package: package: build ## Packages the project.
script/package script/package
.PHONY: packageInstall .PHONY: packageInstall
packageInstall: packageInstall: package ## Installs the package.
script/package_install script/package_install
.PHONY: describe .PHONY: describe
describe: describe: ## Describes the Swift package.
swift package describe swift package describe
.PHONY: resolve .PHONY: resolve
resolve: resolve: ## Resolves SwiftPM dependencies.
swift package resolve swift package resolve
.PHONY: dependencies .PHONY: dependencies
dependencies: resolve dependencies: resolve ## Lists SwiftPM dependencies.
swift package show-dependencies swift package show-dependencies
.PHONY: update .PHONY: update
update: resolve update: resolve ## Updates SwiftPM dependencies.
swift package update swift package update

30
Package.resolved
View file

@ -60,16 +60,16 @@
"repositoryURL": "https://github.com/apple/swift-argument-parser.git", "repositoryURL": "https://github.com/apple/swift-argument-parser.git",
"state": { "state": {
"branch": null, "branch": null,
"revision": "e1465042f195f374b94f915ba8ca49de24300a0d", "revision": "df9ee6676cd5b3bf5b330ec7568a5644f547201b",
"version": "1.0.2" "version": "1.1.3"
} }
}, },
{ {
"package": "swift-format", "package": "swift-format",
"repositoryURL": "https://github.com/apple/swift-format", "repositoryURL": "https://github.com/apple/swift-format",
"state": { "state": {
"branch": "swift-5.5-branch", "branch": "release/5.6",
"revision": "f872223e16742fd97fabd319fbf4a939230cc796", "revision": "e6b8c60c7671066d229e30efa1e31acf57be412e",
"version": null "version": null
} }
}, },
@ -78,8 +78,26 @@
"repositoryURL": "https://github.com/apple/swift-syntax", "repositoryURL": "https://github.com/apple/swift-syntax",
"state": { "state": {
"branch": null, "branch": null,
"revision": "75e60475d9d8fd5bbc16a12e0eaa2cb01b0c322e", "revision": "0b6c22b97f8e9320bca62e82cdbee601cf37ad3f",
"version": "0.50500.0" "version": "0.50600.1"
}
},
{
"package": "swift-system",
"repositoryURL": "https://github.com/apple/swift-system.git",
"state": {
"branch": null,
"revision": "836bc4557b74fe6d2660218d56e3ce96aff76574",
"version": "1.1.1"
}
},
{
"package": "swift-tools-support-core",
"repositoryURL": "https://github.com/apple/swift-tools-support-core.git",
"state": {
"branch": null,
"revision": "b7667f3e266af621e5cc9c77e74cacd8e8c00cb4",
"version": "0.2.5"
} }
}, },
{ {

7
Package.swift
View file

@ -70,7 +70,12 @@ let package = Package(
swiftLanguageVersions: [.v5] swiftLanguageVersions: [.v5]
) )
#if compiler(>=5.5) // https://github.com/apple/swift-format#matching-swift-format-to-your-swift-version
#if compiler(>=5.6)
package.dependencies += [
.package(url: "https://github.com/apple/swift-format", .branch("release/5.6"))
]
#elseif compiler(>=5.5)
package.dependencies += [ package.dependencies += [
.package(url: "https://github.com/apple/swift-format", .branch("swift-5.5-branch")) .package(url: "https://github.com/apple/swift-format", .branch("swift-5.5-branch"))
] ]

2
README.md
View file

@ -210,7 +210,7 @@ apps, and is not yet able to install or update them. [#321](https://github.com/m
If you see this error, it's probably because you haven't installed the app through the App Store yet. If you see this error, it's probably because you haven't installed the app through the App Store yet.
See [#46](https://github.com/mas-cli/mas/issues/46#issuecomment-248581233). See [#46](https://github.com/mas-cli/mas/issues/46#issuecomment-248581233).
> This redownload is not available for this Apple ID either because it was bought by a different user of the > This redownload is not available for this Apple ID either because it was bought by a different user or the
> item was refunded or cancelled. > item was refunded or cancelled.
If `mas` doesn't work for you as expected (e.g. you can't update/download apps), run `mas reset` and try again. If `mas` doesn't work for you as expected (e.g. you can't update/download apps), run `mas reset` and try again.

3
Sources/MasKit/AppStore/Downloader.swift
View file

@ -64,11 +64,10 @@ private func downloadWithRetries(
/// - Returns: A promise the completes when the download is complete. /// - Returns: A promise the completes when the download is complete.
private func download(_ appID: UInt64, purchase: Bool = false) -> Promise<Void> { private func download(_ appID: UInt64, purchase: Bool = false) -> Promise<Void> {
var storeAccount: ISStoreAccount? var storeAccount: ISStoreAccount?
if #available(macOS 12, *) { if #unavailable(macOS 12) {
// Monterey obscured the user's account information, but still allows // Monterey obscured the user's account information, but still allows
// redownloads without passing it to SSPurchase. // redownloads without passing it to SSPurchase.
// https://github.com/mas-cli/mas/issues/417 // https://github.com/mas-cli/mas/issues/417
} else {
guard let account = ISStoreAccount.primaryAccount else { guard let account = ISStoreAccount.primaryAccount else {
return Promise(error: MASError.notSignedIn) return Promise(error: MASError.notSignedIn)
} }

2
script/install
View file

@ -23,7 +23,7 @@ fi
while test -n "$1"; do while test -n "$1"; do
if [[ "$1" == '--universal' ]]; then if [[ "$1" == '--universal' ]]; then
ARCH=universal ARCH=universal
RELEASE=.build/apple/Products/Release RELEASE=.build/release
else else
# Override default prefix path with optional arg # Override default prefix path with optional arg
PREFIX="$1" PREFIX="$1"