From 9d4310e8bd35529aa486461c6ccf420a5bcb15b5 Mon Sep 17 00:00:00 2001 From: Lee Ockert Date: Tue, 19 Jul 2022 12:31:48 -0400 Subject: [PATCH] Clarified UI messages in tmimport.sh Previously used the language "attributes are now" to describe the extended attributes matching a backup drive to a computer. However, that is both overly erudite language and completely meaningless to the average user. Replaced it with the more meaningful language: "This backup drive is currently matched to the following computer:" and "This backup drive has been matched to the current computer:", and omitted the names of the extended attributes. --- tmimport.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tmimport.sh b/tmimport.sh index ed59d73..d8f3df5 100755 --- a/tmimport.sh +++ b/tmimport.sh @@ -125,10 +125,10 @@ Computer Model: %s\n\ Host UUID: %s\n\ MAC Address: %s\n\n" "${SPECIFIED}" "${BACKUPPATH}" "${MODEL}" "${UUID}" "${MAC}" -printf "Attributes are now:\n" -printf " %s\t\t\t%s\n" "com.apple.backupd.ModelID" "$(xattr -p 'com.apple.backupd.ModelID' "${BACKUPPATH}")" -printf " %s\t%s\n" "com.apple.backupd.BackupMachineAddress" "$(xattr -p 'com.apple.backupd.BackupMachineAddress' "${BACKUPPATH}")" -printf " %s\t\t\t%s\n\n" "com.apple.backupd.HostUUID" "$(xattr -p 'com.apple.backupd.HostUUID' "${BACKUPPATH}")" +printf "This backup drive is currently matched to the following computer:\n" +printf " ModelID: %s\n" "$(xattr -p 'com.apple.backupd.ModelID' "${BACKUPPATH}")" +printf " MAC Address: %s\n" "$(xattr -p 'com.apple.backupd.BackupMachineAddress' "${BACKUPPATH}")" +printf " Host UUID: %s\n\n" "$(xattr -p 'com.apple.backupd.HostUUID' "${BACKUPPATH}")" printf "\ Preparing to run the following commands:\n\ @@ -150,10 +150,10 @@ select response in "Apply Time Machine Magic" "ABORT ABORT ABORT!"; do "${SIMONSAYS}" xattr -w 'com.apple.backupd.HostUUID' "${UUID}" "${BACKUPPATH}" "${SIMONSAYS}" tmutil inheritbackup "${BACKUPPATH}" printf "\nOperation completed.\n\n" - printf "Attributes are now:\n" - printf " %s\t\t\t%s\n" "com.apple.backupd.ModelID" "$(xattr -p 'com.apple.backupd.ModelID' "${BACKUPPATH}")" - printf " %s\t%s\n" "com.apple.backupd.BackupMachineAddress" "$(xattr -p 'com.apple.backupd.BackupMachineAddress' "${BACKUPPATH}")" - printf " %s\t\t\t%s\n\n" "com.apple.backupd.HostUUID" "$(xattr -p 'com.apple.backupd.HostUUID' "${BACKUPPATH}")" + printf "This backup drive has been matched to the current computer:\n" + printf " ModelID: %s\n" "$(xattr -p 'com.apple.backupd.ModelID' "${BACKUPPATH}")" + printf " MAC Address: %s\n" "$(xattr -p 'com.apple.backupd.BackupMachineAddress' "${BACKUPPATH}")" + printf " Host UUID: %s\n\n" "$(xattr -p 'com.apple.backupd.HostUUID' "${BACKUPPATH}")" break else printf "\nOperation aborted. No action has been taken.\n\n"