2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
2Shirt 2021-04-05 19:57:47 -06:00
commit 1fcbcb4287
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
4 changed files with 54 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
scripts/launch-in-tmux
View file

@ -9,19 +9,19 @@ if [[ -e "/.wk-live-macos" ]]; then
fi fi
function ask() { function ask() {
while :; do while :; do
read -p "$1 [Y/N] " -r answer read -p "$1 [Y/N] " -r answer
if echo "$answer" | grep -Eiq '^(y|yes|sure)$'; then if echo "$answer" | grep -Eiq '^(y|yes|sure)$'; then
return 0 return 0
elif echo "$answer" | grep -Eiq '^(n|no|nope)$'; then elif echo "$answer" | grep -Eiq '^(n|no|nope)$'; then
return 1 return 1
fi fi
done done
} }
function err () { function err () {
echo "$0:" "$@" >&2 echo "$0:" "$@" >&2
return 1 return 1
} }
function launch_in_tmux() { function launch_in_tmux() {
@ -31,44 +31,44 @@ function launch_in_tmux() {
[[ -n "${TMUX_CMD:-}" ]] || return $(err "Required variable missing (TMUX_CMD)") [[ -n "${TMUX_CMD:-}" ]] || return $(err "Required variable missing (TMUX_CMD)")
# Check for running session # Check for running session
if tmux "${tmux_args[@]}" list-session | grep -q "$SESSION_NAME"; then if tmux "${tmux_args[@]}" list-session 2>&1 | grep -q "$SESSION_NAME"; then
echo "WARNING: tmux session $SESSION_NAME already exists." echo "WARNING: tmux session $SESSION_NAME already exists."
echo "" echo ""
if ask "Connect to current session?"; then if ask "Connect to current session?"; then
if [[ -n "${TMUX:-}" ]]; then if [[ -n "${TMUX:-}" ]]; then
# Running inside TMUX, switch to session # Running inside TMUX, switch to session
tmux "${tmux_args[@]}" switch-client -t "$SESSION_NAME" tmux "${tmux_args[@]}" switch-client -t "$SESSION_NAME"
if ! jobs %% >/dev/null 2>&1; then if ! jobs %% >/dev/null 2>&1; then
# No running jobs, try exiting abandoned tmux session # No running jobs, try exiting abandoned tmux session
exit 0 exit 0
fi fi
else
# Running outside TMUX, attach to session
tmux "${tmux_args[@]}" attach-session -t "$SESSION_NAME"
fi
return 0
elif ask "Kill current session and start new session?"; then
tmux "${tmux_args[@]}" kill-session -t "$SESSION_NAME" || \
die "Failed to kill session: $SESSION_NAME"
else else
echo "Aborted." # Running outside TMUX, attach to session
return 1 tmux "${tmux_args[@]}" attach-session -t "$SESSION_NAME"
fi fi
return 0
elif ask "Kill current session and start new session?"; then
tmux "${tmux_args[@]}" kill-session -t "$SESSION_NAME" || \
die "Failed to kill session: $SESSION_NAME"
else
echo "Aborted."
return 1
fi
fi fi
# Start session # Start session
if [[ -n "${TMUX:-}" ]]; then if [[ -n "${TMUX:-}" ]]; then
# Running inside TMUX, save current session/window names # Running inside TMUX, save current session/window names
ORIGINAL_SESSION_NAME="$(tmux "${tmux_args[@]}" display-message -p '#S')" ORIGINAL_SESSION_NAME="$(tmux "${tmux_args[@]}" display-message -p '#S')"
ORIGINAL_WINDOW_NAME="$(tmux "${tmux_args[@]}" display-message -p '#W')" ORIGINAL_WINDOW_NAME="$(tmux "${tmux_args[@]}" display-message -p '#W')"
tmux "${tmux_args[@]}" rename-session "$SESSION_NAME" tmux "${tmux_args[@]}" rename-session "$SESSION_NAME"
tmux "${tmux_args[@]}" rename-window "$WINDOW_NAME" tmux "${tmux_args[@]}" rename-window "$WINDOW_NAME"
"$TMUX_CMD" "$@" "$TMUX_CMD" "$@"
# Restore previous session/window names # Restore previous session/window names
tmux "${tmux_args[@]}" rename-session "${ORIGINAL_SESSION_NAME}" tmux "${tmux_args[@]}" rename-session "${ORIGINAL_SESSION_NAME}"
tmux "${tmux_args[@]}" rename-window "${ORIGINAL_WINDOW_NAME}" tmux "${tmux_args[@]}" rename-window "${ORIGINAL_WINDOW_NAME}"
else else
# Running outside TMUX, start/attach to session # Running outside TMUX, start/attach to session
tmux "${tmux_args[@]}" new-session -s "$SESSION_NAME" -n "$WINDOW_NAME" "$TMUX_CMD" "$@" tmux "${tmux_args[@]}" new-session -s "$SESSION_NAME" -n "$WINDOW_NAME" "$TMUX_CMD" "$@"
fi fi
} }

6
setup/macos/install-deps
View file

@ -29,7 +29,11 @@ sudo installer -pkg gnuplot.pkg -target /
# mprime # mprime
echo "Installing mprime..." echo "Installing mprime..."
curl -Lo prime95.tar.gz http://www.mersenne.org/ftp_root/gimps/p95v298b7.MacOSX.noGUI.tar.gz if [[ "${OS_VERSION:3:2}" -ge "15" ]]; then
curl -Lo prime95.tar.gz http://www.mersenne.org/ftp_root/gimps/p95v298b7.MacOSX.noGUI.tar.gz
else
curl -Lo prime95.tar.gz http://www.mersenne.org/ftp_root/gimps/p95v287.MacOSX.noGUI.tar.gz
fi
sudo tar -x -C /usr/local/bin -f prime95.tar.gz mprime sudo tar -x -C /usr/local/bin -f prime95.tar.gz mprime
# smc # smc

4
setup/macos/live-macos-startup
View file

@ -7,7 +7,7 @@ for p in /usr/local/{,opt/{e2fsprogs,ruby,util-linux}/}{bin,sbin}; do
PATH="${p}:${PATH}" PATH="${p}:${PATH}"
done done
# Create and mount RAMDisk # Create and mount RAM_Disk
if ! [[ -d /Volumes/RAM_Disk ]]; then if ! [[ -d /Volumes/RAM_Disk ]]; then
echo "Creating RAM Disk..." echo "Creating RAM Disk..."
RAM_DEV="$(hdiutil attach -nomount ram://524288)" RAM_DEV="$(hdiutil attach -nomount ram://524288)"
@ -30,7 +30,7 @@ if ! [[ -e /Volumes/RAM_Disk/.wifi ]]; then
| grep -Eo 'en(\d+)')" | grep -Eo 'en(\d+)')"
networksetup -setairportnetwork "${NET_DEV}" "${WIFI_NET%%:::*}" "${WIFI_NET##*:::}" networksetup -setairportnetwork "${NET_DEV}" "${WIFI_NET%%:::*}" "${WIFI_NET##*:::}"
touch /Volumes/RAM_Disk/.wifi touch /Volumes/RAM_Disk/.wifi
sleep 5s sleep 8s
fi fi
fi fi

11
setup/macos/update-base-image
View file

@ -14,6 +14,7 @@ IMAGE_DEV="$(hdiutil attach -mountpoint /Volumes/BaseSystem "${BASE_IMAGE}" -nob
OS_NAME="$(ls /Volumes/BaseSystem | grep -E 'OS X|macOS' | sed -E 's/Install (OS X|macOS) (.*)\.app/\2/')" OS_NAME="$(ls /Volumes/BaseSystem | grep -E 'OS X|macOS' | sed -E 's/Install (OS X|macOS) (.*)\.app/\2/')"
OS_VERSION="$(defaults read /Volumes/BaseSystem/System/Library/CoreServices/SystemVersion ProductVersion)" OS_VERSION="$(defaults read /Volumes/BaseSystem/System/Library/CoreServices/SystemVersion ProductVersion)"
OUT_NAME="${HOME}/Desktop/WK ${OS_NAME} ($(date +"%Y-%m-%d"))" OUT_NAME="${HOME}/Desktop/WK ${OS_NAME} ($(date +"%Y-%m-%d"))"
TIMEZONE="$(fgrep LINUX_TIME_ZONE ../../scripts/wk/cfg/main.py | cut -d '=' -f 2 | sed "s/'//g")"
WK_PATH="/Volumes/1201_UFD" WK_PATH="/Volumes/1201_UFD"
# Convert to a 4 GB R/W image # Convert to a 4 GB R/W image
@ -77,15 +78,13 @@ rsync -aS com.apple.Terminal.plist "${WK_PATH}/var/root/Library/Preferences"/
# Timezones # Timezones
echo "Installing timezones..." echo "Installing timezones..."
eval "$(fgrep LINUX_TIME ../../scripts/wk/cfg/main.py)"
if [[ "${OS_VERSION:3:2}" == "11" ]]; then if [[ "${OS_VERSION:3:2}" == "11" ]]; then
rsync -aS /usr/share/zoneinfo/ "${WK_PATH}/usr/share/zoneinfo"/ rsync -aS /usr/share/zoneinfo/ "${WK_PATH}/usr/share/zoneinfo"/
ln -sf "/usr/share/zoneinfo/${LINUX_TIME}" "${WK_PATH}/etc/localtime" ln -sf "/usr/share/zoneinfo/${TIMEZONE}" "${WK_PATH}/etc/localtime"
elif [[ "${OS_VERSION:3:2}" -gt "11" ]]; then elif [[ "${OS_VERSION:3:2}" -gt "11" ]]; then
if [[ ! -d "${WK_PATH}/var/db/timezone" ]]; then sudo mkdir -p "${WK_PATH}/var/db/timezone/zoneinfo"
rsync -aS /var/db/timezone "${WK_PATH}/var/db"/ sudo rsync -aS /var/db/timezone/zoneinfo/ "${WK_PATH}/var/db/timezone/zoneinfo"/
fi ln -sf "/var/db/timezone/zoneinfo/${TIMEZONE}" "${WK_PATH}/etc/localtime"
ln -sf "/var/db/timezone/zoneinfo/${LINUX_TIME}" "${WK_PATH}/etc/localtime"
fi fi
# zsh # zsh