Update macOS setup files

This commit is contained in:
2Shirt 2021-04-02 18:34:13 -06:00
parent d2f9e9fd2f
commit 76f74b770b
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
2 changed files with 16 additions and 17 deletions

View file

@ -7,7 +7,7 @@ set -o nounset
set -o pipefail
# Prep
OS_VERSION="$(defaults read /Volumes/BaseSystem/System/Library/CoreServices/SystemVersion ProductVersion)"
OS_VERSION="$(defaults read /System/Library/CoreServices/SystemVersion ProductVersion)"
cd "$(mktemp -d)"
# Inconsolata
@ -30,12 +30,12 @@ sudo installer -pkg gnuplot.pkg -target /
# mprime
echo "Installing mprime..."
curl -Lo prime95.tar.gz http://www.mersenne.org/ftp_root/gimps/p95v298b7.MacOSX.noGUI.tar.gz
tar -x -C /usr/local/bin -f prime95.tar.gz mprime
sudo tar -x -C /usr/local/bin -f prime95.tar.gz mprime
# smc
echo "Installing smc..."
curl -Lo smcfancontrol.zip https://www.eidac.de/smcfancontrol/smcfancontrol_2_6.zip
unzip -d /usr/local/bin -j smcfancontrol.zip smcFanControl.app/Contents/Resources/smc
sudo unzip -d /usr/local/bin -j smcfancontrol.zip smcFanControl.app/Contents/Resources/smc
# Homebrew
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
@ -92,4 +92,4 @@ elif [[ "${OS_VERSION:0:5}" == "10.15" ]]; then
fi
# Python3 Packages
pip3 docopt mysql-connector NumPy psutil pylint pytz requests
pip3 install docopt mysql-connector NumPy psutil pylint pytz requests

View file

@ -40,6 +40,15 @@ elif [[ "${OS_VERSION:0:5}" == "10.15" ]]; then
cp -a "Catalina/Utilities.plist" "${WK_PATH}/System/Installation/CDIS/macOS Utilities.app/Contents/Resources/Utilities.plist"
fi
# Dropbear (SSH)
echo "Installing Dropbear..."
mkdir -p "${WK_PATH}/etc/dropbear"
for t in rsa dss ecdsa ed25519; do
dropbearkey -t "${t}" -f "${WK_PATH}/etc/dropbear/dropbear_${t}_host_key"
done
ln -s /Volumes/RAM_Disk/.ssh "${WK_PATH}/var/root"/
cp -a ../linux/authorized_keys "${WK_PATH}/.authorized_keys"
# Homebrew
echo "Installing Hombrew..."
mkdir -p "${WK_PATH}/usr/local/bin"
@ -58,15 +67,6 @@ cp -a /Library/Fonts/Inconsolata*ttf "${WK_PATH}/System/Library/Fonts"/
echo "Installing pipes.sh..."
cp -a /usr/bin/tput "${WK_PATH}/usr/bin"/
# Dropbear (SSH)
echo "Installing Dropbear..."
mkdir -p "${WK_PATH}/etc/dropbear"
for t in rsa dss ecdsa ed21559; do
dropbearkey -t "${t}" -f "${WK_PATH}/etc/dropbear_${t}_host_key"
done
ln -s /Volumes/RAM_Disk/.ssh "${WK_PATH}/var/root"/
cp -a ../linux/authorized_keys "${WK_PATH}/.authorized_keys"
# Terminal
echo "Installing Terminal Preferences..."
rsync -aS com.apple.Terminal.plist "${WK_PATH}/var/root/Library/Preferences"/
@ -89,7 +89,7 @@ sed -Ei '' 's!^(root.*)/bin/sh!\1/bin/zsh!' "${WK_PATH}/etc/passwd"
# Misc
cp -a ../linux/known_networks "${WK_PATH}/.known_networks"
cp -a /bin/rsync "${WK_PATH}/bin"/
cp -a /usr/bin/rsync "${WK_PATH}/usr/bin"/
cp -a aliases "${WK_PATH}/.aliases"
cp -a bashrc "${WK_PATH}/etc/profile"
cp -a vimrc "${WK_PATH}/.vimrc"
@ -111,6 +111,5 @@ fi
hdiutil detach "${WK_IMAGE_DEV}"
# Convert to compressed read-only image
# TODO
#echo "Converting to read-only image..."
#hdiutil convert -format UDZO -o "${OUT_NAME}.sparsebundle" "${OUT_NAME}.dmg"
echo "Converting to read-only image..."
hdiutil convert -format UDZO -o "${OUT_NAME}.dmg" "${OUT_NAME}.sparsebundle"