Skip to content

Fix atuin login thing #274

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

Merged
djensenius merged 1 commit into from
Dec 5, 2025
Merged

Fix atuin login thing #274

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
8 changes: 5 additions & 3 deletions fish/config.fish
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@ if status is-interactive

# Atuin (login once on Codespaces; then init every interactive shell)
if test -d /workspaces
if not test -e ~/.atuin_logged_in
command -q atuin; and ~/.cargo/bin/atuin login -u $ATUIN_USERNAME -p $ATUIN_PASSWORD -k $ATUIN_KEY
touch ~/.atuin_logged_in
if command -q atuin
# Check if already logged in by looking for Username in status
if not ~/.cargo/bin/atuin status | grep -q "Username:"
~/.cargo/bin/atuin login -u $ATUIN_USERNAME -p $ATUIN_PASSWORD -k $ATUIN_KEY
end
end
end
atuin init fish | source
Expand Down
18 changes: 15 additions & 3 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,11 @@ function install_software() {
if [ -n "$ATUIN_USERNAME" ] && [ -n "$ATUIN_PASSWORD" ] && [ -n "$ATUIN_KEY" ] && [ $atuin_exit -eq 0 ]; then
start_time=$(start_operation "Atuin login setup")
echo "🔐 Setting up Atuin login..."
~/.cargo/bin/atuin login -u "$ATUIN_USERNAME" -p "$ATUIN_PASSWORD" -k "$ATUIN_KEY"
if ! ~/.cargo/bin/atuin status | grep -q "Username:"; then
~/.cargo/bin/atuin login -u "$ATUIN_USERNAME" -p "$ATUIN_PASSWORD" -k "$ATUIN_KEY"
else
echo "✅ Atuin already logged in"
fi
log_with_timing "Atuin login setup" "$start_time"
fi

Expand Down Expand Up @@ -459,9 +463,17 @@ function install_software() {
start_time=$(start_operation "Logging into Atuin")
echo "Log in to atuin"
if [ -d /workspaces/github ]; then
~/.cargo/bin/atuin login -u "$ATUIN_USERNAME" -p "$ATUIN_PASSWORD" -k "$ATUIN_KEY"
if ! ~/.cargo/bin/atuin status | grep -q "Username:"; then
~/.cargo/bin/atuin login -u "$ATUIN_USERNAME" -p "$ATUIN_PASSWORD" -k "$ATUIN_KEY"
else
echo "✅ Atuin already logged in"
fi
else
/usr/local/cargo/bin/atuin login -u "$ATUIN_USERNAME" -p "$ATUIN_PASSWORD" -k "$ATUIN_KEY"
if ! /usr/local/cargo/bin/atuin status | grep -q "Username:"; then
/usr/local/cargo/bin/atuin login -u "$ATUIN_USERNAME" -p "$ATUIN_PASSWORD" -k "$ATUIN_KEY"
else
echo "✅ Atuin already logged in"
fi
fi
log_with_timing "Logging into Atuin" "$start_time"

Expand Down
10 changes: 7 additions & 3 deletions scripts/parallel-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,14 @@ install_cargo_packages_background() {
# Immediately setup atuin if credentials are available (don't wait for other tools)
if [ -n "$ATUIN_USERNAME" ] && [ -n "$ATUIN_PASSWORD" ] && [ -n "$ATUIN_KEY" ]; then
echo "[$(date '+%Y-%m-%d %H:%M:%S')] 🔧 Setting up Atuin immediately after installation..." >> "$LOG_FILE"
if ~/.cargo/bin/atuin login -u "$ATUIN_USERNAME" -p "$ATUIN_PASSWORD" -k "$ATUIN_KEY" >> "$LOG_FILE" 2>&1; then
echo "[$(date '+%Y-%m-%d %H:%M:%S')] ✅ Atuin login completed immediately" >> "$LOG_FILE"
if ! ~/.cargo/bin/atuin status | grep -q "Username:"; then
if ~/.cargo/bin/atuin login -u "$ATUIN_USERNAME" -p "$ATUIN_PASSWORD" -k "$ATUIN_KEY" >> "$LOG_FILE" 2>&1; then
echo "[$(date '+%Y-%m-%d %H:%M:%S')] ✅ Atuin login completed immediately" >> "$LOG_FILE"
else
echo "[$(date '+%Y-%m-%d %H:%M:%S')] ⚠️ Atuin login failed - check credentials" >> "$LOG_FILE"
fi
else
echo "[$(date '+%Y-%m-%d %H:%M:%S')] ⚠️ Atuin login failed - check credentials" >> "$LOG_FILE"
echo "[$(date '+%Y-%m-%d %H:%M:%S')] ✅ Atuin already logged in" >> "$LOG_FILE"
fi
fi
else
Expand Down