Skip to content

Harden assimilate.sh: arch-aware delta, quoted $HOME, perms #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
akan72 wants to merge 1 commit into from
Open

Harden assimilate.sh: arch-aware delta, quoted $HOME, perms #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions assimilate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ sym claude/statusline.sh .claude/statusline.sh
sym agent-instructions.md .claude/CLAUDE.md
sym agent-instructions.md .codex/AGENTS.md

# Lock down sensitive symlink targets (chmod follows the symlink to the repo file).
chmod 600 "$HOME/.gitconfig"
[ -d "$HOME/.ssh" ] && chmod 700 "$HOME/.ssh"

# bashrc: symlinked on macOS; sourced from a stub on Linux.
# On the EC2 dev box, user_data appends a secrets/region block to .bashrc after
# this script runs. If .bashrc were a symlink into the repo, those appends would
Expand Down Expand Up @@ -125,8 +129,8 @@ if [ ! -d "$HOME/.cargo" ]; then
| sh -s -- -y --no-modify-path --default-toolchain 1.95.0
fi

# Install git-delta from a pinned GitHub release tarball (sidesteps brew bottle ABI drift).
# Tarball target and SHA256 are platform-specific.
# Install git-delta from a pinned GitHub release tarball when available.
# delta 0.19.2 has no Intel macOS archive, so that platform uses Homebrew.
DELTA_VERSION=0.19.2
DELTA_BIN="$HOME/.local/bin/delta"

Expand All @@ -139,6 +143,12 @@ case "$OS-$ARCH" in
DELTA_TARGET=x86_64-unknown-linux-gnu
DELTA_SHA256=8e695c5f586a8c53d6c3b01be0b4a422ed218bfed2a56191caebe373a1c18ab2
;;
Darwin-x86_64)
DELTA_TARGET=""
if [ "$("$DELTA_BIN" --version 2>/dev/null | awk '{print $2}')" != "$DELTA_VERSION" ]; then
brew install git-delta
fi
;;
*)
echo "WARN: no delta build pinned for $OS-$ARCH — skipping delta install" >&2
DELTA_TARGET=""
Expand All @@ -148,14 +158,10 @@ esac
if [ -n "$DELTA_TARGET" ] && { [ ! -x "$DELTA_BIN" ] || [ "$("$DELTA_BIN" --version 2>/dev/null | awk '{print $2}')" != "$DELTA_VERSION" ]; }; then
tmp=$(mktemp -d)
curl -fsSL "https://github.com/dandavison/delta/releases/download/${DELTA_VERSION}/delta-${DELTA_VERSION}-${DELTA_TARGET}.tar.gz" -o "$tmp/delta.tar.gz"
if [ -n "$DELTA_SHA256" ]; then
if command -v sha256sum >/dev/null; then
echo "${DELTA_SHA256} $tmp/delta.tar.gz" | sha256sum -c -
else
echo "${DELTA_SHA256} $tmp/delta.tar.gz" | shasum -a 256 -c -
fi
if command -v sha256sum >/dev/null; then
echo "${DELTA_SHA256} $tmp/delta.tar.gz" | sha256sum -c -
else
echo "WARN: no DELTA_SHA256 pinned for $OS-$ARCH — integrity check skipped" >&2
echo "${DELTA_SHA256} $tmp/delta.tar.gz" | shasum -a 256 -c -
fi
mkdir -p "$HOME/.local/bin"
tar -xzf "$tmp/delta.tar.gz" -C "$tmp"
Expand Down
4 changes: 2 additions & 2 deletions bash_profile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if [ -f $HOME/.bashrc ]; then
source $HOME/.bashrc
if [ -f "$HOME/.bashrc" ]; then
source "$HOME/.bashrc"
fi