From dc7da639d8d5e50dcf748f13807c50705f62a40c Mon Sep 17 00:00:00 2001 From: Sebastian Potasiak Date: Thu, 30 Aug 2018 13:46:34 +0200 Subject: [PATCH] Add option to create images with case-sensitive filesystems --- AutoDMG.xcodeproj/project.pbxproj | 10 +++++----- AutoDMG/AutoDMG-Info.plist | 2 +- AutoDMG/progresswatcher.py | 9 +++++++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/AutoDMG.xcodeproj/project.pbxproj b/AutoDMG.xcodeproj/project.pbxproj index e8dfa21..81d3c65 100644 --- a/AutoDMG.xcodeproj/project.pbxproj +++ b/AutoDMG.xcodeproj/project.pbxproj @@ -321,7 +321,7 @@ ORGANIZATIONNAME = "University of Gothenburg"; TargetAttributes = { 66EA72C817EB1585009B8350 = { - DevelopmentTeam = 5KQ3D3FG5H; + DevelopmentTeam = 3M328Q89SP; }; }; }; @@ -584,11 +584,11 @@ buildSettings = { CODE_SIGN_IDENTITY = "Mac Developer"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer"; - DEVELOPMENT_TEAM = 5KQ3D3FG5H; + DEVELOPMENT_TEAM = 3M328Q89SP; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "AutoDMG/AutoDMG-Prefix.pch"; INFOPLIST_FILE = "AutoDMG/AutoDMG-Info.plist"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_BUNDLE_IDENTIFIER = "se.gu.it.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = AutoDMG; WRAPPER_EXTENSION = app; @@ -600,11 +600,11 @@ buildSettings = { CODE_SIGN_IDENTITY = "Mac Developer"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer"; - DEVELOPMENT_TEAM = 5KQ3D3FG5H; + DEVELOPMENT_TEAM = 3M328Q89SP; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "AutoDMG/AutoDMG-Prefix.pch"; INFOPLIST_FILE = "AutoDMG/AutoDMG-Info.plist"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_BUNDLE_IDENTIFIER = "se.gu.it.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = AutoDMG; WRAPPER_EXTENSION = app; diff --git a/AutoDMG/AutoDMG-Info.plist b/AutoDMG/AutoDMG-Info.plist index 65dbcb3..fb8cfab 100644 --- a/AutoDMG/AutoDMG-Info.plist +++ b/AutoDMG/AutoDMG-Info.plist @@ -36,7 +36,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.8.1 + 1.8.1+tomtom CFBundleSignature ???? CFBundleVersion diff --git a/AutoDMG/progresswatcher.py b/AutoDMG/progresswatcher.py index 9d5dba7..bced5e2 100755 --- a/AutoDMG/progresswatcher.py +++ b/AutoDMG/progresswatcher.py @@ -316,7 +316,12 @@ def installesdtodmg(args): pwargs = ["./installesdtodmg.sh", args.user, args.group, - {"hfs": "HFS+J", "apfs": "APFS"}[args.fstype], + { + "hfs": "HFS+J", + "cs-hfs": "Case-sensitive Journaled HFS+", + "apfs": "APFS", + "cs-apfs": "Case-sensitive APFS" + }[args.fstype], args.output, args.volume_name, args.size, @@ -345,7 +350,7 @@ def main(argv): iedparser = sp.add_parser("installesdtodmg", help="Perform installation to DMG") iedparser.add_argument("-u", "--user", help="Change owner of DMG", required=True) iedparser.add_argument("-g", "--group", help="Change group of DMG", required=True) - iedparser.add_argument("-f", "--fstype", choices=["apfs", "hfs"], help="File system type", required=True) + iedparser.add_argument("-f", "--fstype", choices=["apfs", "cs-apfs", "hfs", "cs-hfs"], help="File system type", required=True) iedparser.add_argument("-o", "--output", help="Set output path", required=True) iedparser.add_argument("-t", "--template", help="Path to adtmpl", required=True) iedparser.add_argument("-n", "--volume-name", default="Macintosh HD", help="Set installed system's volume name.")