Merge pull request #1090 from rgoldberg/1089-pkg-installer

Update pkg installer for wrapper shell script

Author: rgoldberg

Scripts/_setup_script

@@ -36,10 +36,10 @@ unset KEYBOARD_HACK
 unset TMPSUFFIX
 unset WORDCHARS
 
-mas_dir="${0:A:h:h}"
+mas_folder="${0:A:h:h}"
 
-if ! cd -- "${mas_dir}"; then
-	printf $'Error: Failed to cd into mas directory: %s\n' "${mas_dir}" >&2
+if ! cd -- "${mas_folder}"; then
+	printf $'Error: Failed to cd into mas folder: %s\n' "${mas_folder}" >&2
 	exit 1
 fi
 

Scripts/clean

@@ -5,7 +5,7 @@
 #
 # Copyright © 2025 mas-cli. All rights reserved.
 #
-# Deletes the build directory & other generated files.
+# Deletes the build folder & other generated files.
 #
 
 . "${0:A:h}/_setup_script"

Scripts/package

@@ -16,20 +16,36 @@ export MAS_DO_NOT_PRINT_NOTICE=
 Scripts/build "${1:-}" -c release "${@:2}"
 unset MAS_DO_NOT_PRINT_NOTICE
 
-build_dir=.build
-destination_dir="${build_dir}/destination"
-mas_executable="${destination_dir}/mas"
+build_folder=.build
+destination_folder="${build_folder}/destination"
+installation_folder=/usr/local/opt/mas
+installation_staging_folder="${destination_folder}${installation_folder}"
+usr_local_bin_staging_folder="${destination_folder}/usr/local/bin"
 version="$(Scripts/version)"
 
-mkdir -p "${destination_dir}"
-ln -f "$(swift build -c release --show-bin-path "${@:2}")/mas" "${mas_executable}"
+swift package generate-manual
+
+mkdir -p "${installation_staging_folder}/bin"
+mkdir -p "${installation_staging_folder}/etc/bash_completion.d"
+mkdir -p "${installation_staging_folder}/share/fish/vendor_completions.d"
+mkdir -p "${installation_staging_folder}/share/man/man1"
+mkdir -p "${usr_local_bin_staging_folder}"
+
+cp LICENSE README.md "${installation_staging_folder}"
+cp Scripts/mas "${installation_staging_folder}/bin/mas"
+cp contrib/completion/mas-completion.bash "${installation_staging_folder}/etc/bash_completion.d/mas"
+cp contrib/completion/mas.fish "${installation_staging_folder}/share/fish/vendor_completions.d/mas.fish"
+ln -f "$(swift build -c release --show-bin-path "${@:2}")/mas" "${installation_staging_folder}/bin/mas-bin"
+ln -f .build/plugins/GenerateManual/outputs/mas/mas.1 "${installation_staging_folder}/share/man/man1/mas.1"
+
+ln -fs "${installation_folder}/bin/mas" "${usr_local_bin_staging_folder}/mas"
 
 pkgbuild\
  --identifier io.github.mas-cli.mas\
- --install-location /usr/local/bin\
+ --install-location /\
  --version "${version}"\
- --root "${destination_dir}"\
- "${build_dir}/mas_components.pkg"
+ --root "${destination_folder}"\
+ "${build_folder}/mas_components.pkg"
 
 # shellcheck disable=SC1036
 productbuild\
@@ -60,5 +76,5 @@ productbuild\
 </installer-gui-script>
 END
 )\
- --package-path "${build_dir}"\
- "${build_dir}/mas-${version}-${${(s: :o)$(lipo -archs "${mas_executable}")}// /-}.pkg"
+ --package-path "${build_folder}"\
+ "${build_folder}/mas-${version}-${${(s: :o)$(lipo -archs "${installation_staging_folder}/bin/mas-bin")}// /-}.pkg"

Sources/mas/AppStore/DownloadQueueObserver.swift

@@ -264,8 +264,7 @@ final class DownloadQueueObserver: CKDownloadQueueObserver {
 		}
 		guard
 			let appFolderURLResult = appFolderURLRegex // swiftformat:disable indent
-			.matches(in: standardErrorText, range: NSRange(location: 0, length: standardErrorText.count))
-			.first,
+			.firstMatch(in: standardErrorText, range: NSRange(location: 0, length: standardErrorText.count)),
 			let appFolderURLNSRange = appFolderURLResult.range(at: 1) as NSRange?,
 			appFolderURLNSRange.location != NSNotFound,
 			let appFolderURLRange = Range(appFolderURLNSRange, in: standardErrorText)

Sources/mas/Commands/Lookup.swift

@@ -7,6 +7,7 @@
 
 internal import ArgumentParser
 private import Foundation
+private import ObjectiveC
 
 extension MAS {
 	/// Outputs app information from the App Store.
@@ -41,7 +42,7 @@ extension MAS {
 					"""
 					\(catalogApp.name) \(catalogApp.version) [\(catalogApp.formattedPrice)]
 					By: \(catalogApp.sellerName)
-					Released: \(catalogApp.releaseDate.humanReadableDate)
+					Released: \(catalogApp.releaseDate.isoCalendarDate)
 					Minimum OS: \(catalogApp.minimumOSVersion)
 					Size: \(catalogApp.fileSizeBytes.humanReadableSize)
 					From: \(catalogApp.appStorePageURL)
@@ -55,10 +56,16 @@ extension MAS {
 
 private extension String {
 	var humanReadableSize: Self {
-		Int64(self).map { ByteCountFormatter.string(fromByteCount: $0, countStyle: .file) } ?? self
+		Int64(self).map { size in
+			let formatter = ByteCountFormatter()
+			formatter.allowedUnits = .useMB
+			formatter.allowsNonnumericFormatting = false
+			return formatter.string(fromByteCount: size)
+		}
+		?? self // swiftformat:disable:this indent
 	}
 
-	var humanReadableDate: Self {
+	var isoCalendarDate: Self {
 		ISO8601DateFormatter().date(from: self).map { date in
 			ISO8601DateFormatter.string(from: date, timeZone: .current, formatOptions: [.withFullDate])
 		}