From b3e7b55635161292a83f61ca3a5554bd9a3c14b4 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Sun, 4 Apr 2021 02:58:05 -0600 Subject: [PATCH] Add fixes for El Capitan --- .gitignore | 1 + setup/macos/El Capitan/Utilities.plist | 4 ++-- .../El Capitan/com.googlecode.iterm2.plist | Bin 14002 -> 0 bytes setup/macos/live-macos-startup | 4 ++-- setup/macos/update-base-image | 18 ++++++++++++++---- 5 files changed, 19 insertions(+), 8 deletions(-) delete mode 100644 setup/macos/El Capitan/com.googlecode.iterm2.plist diff --git a/.gitignore b/.gitignore index 420330cc..3d61efb8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ **/__pycache__ **/*.7z +**/*.DS_Store **/*.bak **/*.exe **/*.swp diff --git a/setup/macos/El Capitan/Utilities.plist b/setup/macos/El Capitan/Utilities.plist index 89304181..0fc61ad2 100644 --- a/setup/macos/El Capitan/Utilities.plist +++ b/setup/macos/El Capitan/Utilities.plist @@ -6,11 +6,11 @@ BundlePath - /Applications/iTerm.app + /Applications/Utilities/Terminal.app DescriptionKey Hardware Diagnostics Path - /Applications/iTerm.app/Contents/MacOS/iTerm2 + /Applications/Utilities/Terminal.app/Contents/MacOS/Terminal TitleKey WizardKit: Hardware Diagnostics diff --git a/setup/macos/El Capitan/com.googlecode.iterm2.plist b/setup/macos/El Capitan/com.googlecode.iterm2.plist deleted file mode 100644 index 71eb86a86c5ec452b76081d9fbe68c22b5fdaaeb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14002 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 EJ2k)oG5`Po diff --git a/setup/macos/live-macos-startup b/setup/macos/live-macos-startup index f636a6aa..2196b681 100755 --- a/setup/macos/live-macos-startup +++ b/setup/macos/live-macos-startup @@ -12,7 +12,7 @@ if ! [[ -d /Volumes/RAM_Disk ]]; then echo "Creating RAM Disk..." RAM_DEV="$(hdiutil attach -nomount ram://524288)" diskutil quiet erasevolume HFS+ RAM_Disk ${RAM_DEV} - diskutil unmount ${RAM_DEV} + diskutil quiet unmount ${RAM_DEV} mkdir /Volumes/RAM_Disk mount -t hfs -o owners ${RAM_DEV} /Volumes/RAM_Disk fi @@ -30,7 +30,7 @@ if ! [[ -e /Volumes/RAM_Disk/.wifi ]]; then | grep -Eo 'en(\d+)')" networksetup -setairportnetwork "${NET_DEV}" "${WIFI_NET%%:::*}" "${WIFI_NET##*:::}" touch /Volumes/RAM_Disk/.wifi - sleep 1s + sleep 5s fi fi diff --git a/setup/macos/update-base-image b/setup/macos/update-base-image index 6ae3c080..4dc7daee 100755 --- a/setup/macos/update-base-image +++ b/setup/macos/update-base-image @@ -72,11 +72,16 @@ echo "Installing Terminal Preferences..." rsync -aS com.apple.Terminal.plist "${WK_PATH}/var/root/Library/Preferences"/ # Timezones -if [[ ! -d "${WK_PATH}/var/db/timezone" ]]; then - echo "Installing timezones..." - rsync -aS /var/db/timezone "${WK_PATH}/var/db"/ +echo "Installing timezones..." +if [[ "${OS_VERSION:3:2}" == "11" ]]; then + rsync -aS /usr/share/zoneinfo/ "${WK_PATH}/usr/share/zoneinfo"/ + ln -sf /usr/share/zoneinfo/America/Los_Angeles "${WK_PATH}/etc/localtime" +elif [[ "${OS_VERSION:3:2}" -gt "11" ]]; then + if [[ ! -d "${WK_PATH}/var/db/timezone" ]]; then + rsync -aS /var/db/timezone "${WK_PATH}/var/db"/ + fi + ln -sf /var/db/timezone/zoneinfo/US/Pacific "${WK_PATH}/etc/localtime" fi -ln -sf /var/db/timezone/zoneinfo/US/Pacific "${WK_PATH}/etc/localtime" # zsh echo "Installing zsh..." @@ -94,6 +99,11 @@ cp -a /usr/sbin/networksetup "${WK_PATH}/usr/sbin"/ cp -a aliases "${WK_PATH}/.aliases" cp -a bashrc "${WK_PATH}/etc/profile" cp -a vimrc "${WK_PATH}/.vimrc" +if [[ "${OS_VERSION:3:2}" == "11" ]]; then + cp -a /usr/bin/fgrep "${WK_PATH}/usr/bin"/ + cp -a /usr/bin/locale "${WK_PATH}/usr/bin"/ + rsync -aS /usr/share/locale/ "${WK_PATH}/usr/share/locale"/ +fi # WizardKit echo "Installing WizardKit env..."