Merge remote-tracking branch 'upstream/dev' into dev

.gitignore

@@ -1,5 +1,6 @@
 **/__pycache__
 **/*.7z
+**/*.DS_Store
 **/*.bak
 **/*.exe
 **/*.swp

setup/macos/El Capitan/Utilities.plist

@@ -6,11 +6,11 @@
 	<array>
 		<dict>
 			<key>BundlePath</key>
-			<string>/Applications/iTerm.app</string>
+			<string>/Applications/Utilities/Terminal.app</string>
 			<key>DescriptionKey</key>
 			<string>Hardware Diagnostics</string>
 			<key>Path</key>
-			<string>/Applications/iTerm.app/Contents/MacOS/iTerm2</string>
+			<string>/Applications/Utilities/Terminal.app/Contents/MacOS/Terminal</string>
 			<key>TitleKey</key>
 			<string>WizardKit: Hardware Diagnostics</string>
 		</dict>

setup/macos/High Sierra/Utilities.plist

@@ -6,11 +6,11 @@
 	<array>
 		<dict>
 			<key>BundlePath</key>
-			<string>/Applications/iTerm-2.app</string>
+			<string>/Applications/Utilities/Terminal.app</string>
 			<key>DescriptionKey</key>
 			<string>Hardware Diagnostics</string>
 			<key>Path</key>
-			<string>/Applications/iTerm-2.app/Contents/MacOS/iTerm2</string>
+			<string>/Applications/Utilities/Terminal.app/Contents/MacOS/Terminal</string>
 			<key>TitleKey</key>
 			<string>WizardKit: Hardware Diagnostics</string>
 		</dict>

setup/macos/install-deps

@@ -43,7 +43,6 @@ if [[ "${OS_VERSION:0:5}" == "10.11" ]]; then
   # TODO: Maybe?
   true
 elif [[ "${OS_VERSION:0:5}" == "10.13" ]]; then
-  # TODO: Add colordiff
   brew install --build-from-source \
     automake \
     lua \
@@ -69,7 +68,9 @@ elif [[ "${OS_VERSION:0:5}" == "10.13" ]]; then
     watch
   brew install \
     cmatrix \
+    colordiff \
     ddrescue \
+    dropbear \
     speedtest-cli \
     tmux
 elif [[ "${OS_VERSION:0:5}" == "10.15" ]]; then
@@ -93,3 +94,8 @@ fi
 
 # Python3 Packages
 pip3 install docopt mysql-connector NumPy psutil pylint pytz requests
+
+git clone https://github.com/yuyichao/gnuplot-py gnuplot-py
+cd gnuplot-py
+git checkout 2c2218dc67
+python3 setup.py install

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
 

setup/macos/update-base-image

@@ -76,11 +76,17 @@ 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..."
-  echo "Installing timezones..."
+eval "$(fgrep LINUX_TIME ../../scripts/wk/cfg/main.py)"
+if [[ "${OS_VERSION:3:2}" == "11" ]]; then
+  rsync -aS /usr/share/zoneinfo/ "${WK_PATH}/usr/share/zoneinfo"/
+  ln -sf "/usr/share/zoneinfo/${LINUX_TIME}" "${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/${LINUX_TIME}" "${WK_PATH}/etc/localtime"
 fi
-ln -sf /var/db/timezone/zoneinfo/US/Pacific "${WK_PATH}/etc/localtime"
 
 # zsh
 echo "Installing zsh..."
@@ -98,6 +104,13 @@ 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"/
+elif [[ "${OS_VERSION:3:2}" == "13" ]]; then
+  cp -a /usr/lib/libexpat* "${WK_PATH}/usr/lib"/
+fi
 
 # WizardKit
 echo "Installing WizardKit env..."